diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
index 6efe6e18cdb..2d4eaa013a8 100644
--- 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
diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
index 24914915616..89a35f9a1ce 100644
--- 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
}
}
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 478bc85cd28..fa2205ec1b1 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index 5e3e0037b99..0535333cfa7 100644
--- 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": {
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index 926cadcea75..b8eca85df3d 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index c01008fddac..e0a2339cbd6 100644
--- 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": {
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index ae376dfa531..d5ec7364361 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .*/
#define SSD1306OLED
-#define RGBLED_NUM 4
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 9b536e0677f..15d4702427b 100644
--- 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"
},
diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h
index afdc6d4baab..0d0cd3712a7 100644
--- 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
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
index 090e93b94bd..34f33d50595 100644
--- 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"
},
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 8f7b3d4a766..8d1b1dad397 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index e4932c23ccc..037dac587a9 100644
--- 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": {
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index aeda8afd338..cc69f084ff2 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 712999df325..f1281b0844c 100644
--- 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"
},
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 8bbb646e40d..401de718c15 100644
--- 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
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index ee6914a4e59..8ee133dc353 100644
--- 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"
},
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index 02100955e4a..a47120f7d39 100644
--- 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
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 16ef9c2f4bd..2348809fab1 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see .
#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
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index 2df890dc7f6..70db2dfe3be 100644
--- 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": {
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index bed2edc0a66..e46bad61304 100644
--- 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
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index cb82e7fcfb3..0649d45cd31 100644
--- 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"
},
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index 88687335de7..37a85b4711d 100644
--- 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
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index 62fcaf8c547..ecb42e0530f 100644
--- 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 .
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index 6138e6155b1..f827d2eff76 100644
--- 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": {
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 8452c624d70..ecb42e0530f 100644
--- 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 .
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 40773851fda..18354269ed9 100644
--- 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": {
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index fd50a97473a..203045cf30e 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index ac61f13d77a..b85afaa565f 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -15,6 +15,7 @@
]
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index a4088e49256..b3548d696e4 100644
--- 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
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index 1752531ba17..66636b4a3c5 100644
--- 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"
},
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index e388bc97056..eb254d4043b 100644
--- 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
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index eb5c0e4a9d7..9ee787ad63e 100644
--- 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"
},
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index 8641d6a37f8..3e8f6e666b2 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -28,4 +28,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6 // Number of LEDs
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 21e5c2d1d2b..5ad37b00b54 100644
--- 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"
},
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 57981dd27ff..0683ac6c5f9 100644
--- 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
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index b58ee84edc8..66b91eac422 100644
--- 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"
},
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 2199981c7c9..db25f7f8d4e 100644
--- 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
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index c881f7c7d10..a9b97c32233 100644
--- 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"
},
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index 4ec3391a61e..d1fb77e0728 100644
--- 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
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
index cbcf0f5997c..5f8c7c2c07d 100644
--- 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"
},
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index e6f7c748a5a..eb5c25c4aa9 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 12
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index 4e218f9365e..f77b4d32098 100644
--- 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"
},
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 6114950220c..29444cd4565 100644
--- 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 .
#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
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
index 02d4f386327..85c2575cd4e 100644
--- 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"
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index 7c8c8a8cf22..c1b0a3a60ef 100644
--- 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 .
#define BACKLIGHT_PAL_MODE 1
/* Underglow */
-#define RGBLED_NUM 16
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index 82d6349dc72..0ba65692977 100644
--- 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"
},
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 2552b1e451f..4d343b22218 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 1
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 90fe5d02a22..ef266031dc7 100644
--- 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"
},
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
index 06e5db9090c..b6fd6835f35 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 1
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index c33d2b0616c..ff955e7553e 100644
--- 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"
},
diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
index 2ba774712ab..ae972e0dd55 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 1
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
index 01aba228636..9c509649485 100644
--- 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"
},
diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h
index e42bb68b370..87076dfb11e 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 2
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
index 34ec33bbe21..ce4b29b3d5c 100644
--- 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"
},
diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
index 1bf561d74ae..ae972e0dd55 100644
--- 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 .
*/
#pragma once
-#define RGBLED_NUM 2
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
index 61673e609d6..f3f23d16bbd 100644
--- 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"
},
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
index 5139d4cf699..e48b4d5a72e 100644
--- 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
diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json
index 45dec97b330..fffac7d4268 100644
--- 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"
},
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index bb910a4427d..bd03d32227f 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -17,6 +17,4 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 1 // Number of LEDs
-
#define TAPPING_TERM 200
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index 1dc9fad41a1..d4061d82614 100644
--- 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"
},
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index ed3b65bf7ef..91ae8450758 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define DIP_SWITCH_PINS { D0 }
-# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
index 81503d24c0a..460521c93aa 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 17,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index b42ece99a60..7fedf4dce12 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -20,5 +20,4 @@ along with this program. If not, see .
/* 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
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 9121f358b29..808fff7fc3b 100644
--- 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 .
#pragma once
- #define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 2d1ae54ecdb..8b11d2c0cc6 100644
--- 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": {
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 31b0284f20a..e00fb9db59d 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 5ba9ae4f0c2..cb2e327088d 100644
--- 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": {
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 1f91766add0..1bb03e3783d 100644
--- 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 .
#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
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index e72e8aece46..ff0ebf94b52 100644
--- 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"
},
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 0376a9ac2ca..77985b2ae54 100644
--- 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 .
#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
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index b2ced072a89..21b7a96337a 100644
--- 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"
},
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 4b8e12dc0c1..ce90c7e2e0e 100644
--- 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 .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index b493b0b4b48..bd0a52e3b2e 100644
--- 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": {
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index e892d5bd3d0..89122ba8cc6 100755
--- 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 .
#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
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index edfcc58d090..429cb11293f 100644
--- 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
},
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 348b284a3ff..25ad6b3bf02 100644
--- 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 .
#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
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 504e86f4b3f..ca1ef7082bb 100644
--- 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"
},
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
index c1f11c77b03..5fa6832ddc3 100644
--- 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
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
index 2663cc502fc..829e31ad275 100644
--- 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
},
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index b49a6cf4c2e..7a69492104b 100644
--- 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
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index e97d2e01e9b..e44726a1e94 100644
--- 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": {
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 08db87fefe1..818a8229f58 100644
--- 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
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index d8dc8953d04..389f5e6aa2d 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index 6325354fd9f..44308024ae8 100644
--- 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": {
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
index 17be0017eff..cbc2502754c 100644
--- 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
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index a2906cd1174..c7b239ac8fd 100644
--- 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": {
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 0bc48fb5626..ae855d38ac5 100644
--- 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
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index bfdcae090e5..1018336ed56 100644
--- 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"
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index d70b56bd622..8679584d990 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index 2753813eda6..d34a785aa75 100644
--- 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
},
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index dffeb072ee2..5ce015408ae 100644
--- 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 .
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json
index 063ef8c5a3f..cd790bcc694 100644
--- 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": {
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index c36702bbff7..3c015aa926a 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index 46d69775065..c014385a97b 100644
--- 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]
},
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index b94b584df0e..8d1b1dad397 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index 9d304c8de9a..d3f680fa4a2 100644
--- 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"
},
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index b828f65b6c9..1b60bb4dcf3 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 28
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 0de3436770f..b25c832847e 100644
--- 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": {
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index c982289a0be..9368693119a 100644
--- 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
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index ea54b093ce5..ce2549d92e2 100644
--- 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"
},
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index ea845147f9a..c8747a50c24 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 20e9c512216..4b355474408 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index 75e49d49c69..58d4183f3fa 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -17,7 +17,6 @@
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 17dc3f45e24..062106fdf37 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 14,
"max_brightness": 100,
"sleep": true
},
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index b4ab41d42cc..401de718c15 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index 86e4dbefb30..6c8c5e4c35c 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -7,6 +7,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index b78b6b00a77..3717a6d07c6 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json
index d1a2131d4ef..51357fb0c90 100644
--- a/keyboards/alpine65/info.json
+++ b/keyboards/alpine65/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 34e622bfb33..1ae535468f0 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
index 9ee25d06d8b..3a78dcbc226 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -8,6 +8,9 @@
"pid": "0x2323",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 9ec9dcbbebe..619ebff2e7d 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 4 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index a3bbb13785e..6001d3ed217 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 4
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index c5f26de5aac..23a98fa4801 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index 236db9bd083..eb011f53e15 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -18,6 +18,9 @@
"levels": 4,
"breathing": true
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 577215da4cd..dc469350de6 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index 23bfedd721f..45dade12f82 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -8,6 +8,9 @@
"pid": "0x6074",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index ecd9f99ed95..870aedd6d62 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index d5e1b042f40..40e1c556d7d 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 4
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index 247ce815547..1f9e8a3b0a4 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index 5dd6d5fd016..579f90dde9f 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -13,6 +13,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index a30a446491a..d512e7eb678 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 88
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
index 9b4f70a7ef4..9b5ddc6715d 100644
--- a/keyboards/aos/tkl/info.json
+++ b/keyboards/aos/tkl/info.json
@@ -11,6 +11,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 88,
"max_brightness": 50
},
"matrix_pins": {
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
deleted file mode 100644
index b2cbbade075..00000000000
--- a/keyboards/arabica37/rev1/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 50 // Number of LEDs
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index ed04e5eb141..14d0c01cb9e 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 50,
"split_count": [25, 25]
},
"ws2812": {
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index ddc21dae308..d849732a072 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 16
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index 81646cb00c3..333e883a5e7 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -22,6 +22,9 @@
"bootmagic": {
"matrix": [4, 0]
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index d70b56bd622..8679584d990 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json
index 7e92b02c492..3fda68f5872 100644
--- a/keyboards/atxkb/1894/info.json
+++ b/keyboards/atxkb/1894/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index fad29eeec2c..9a3ea524bb9 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 5
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index fd03acb5bdc..3b77986d4ca 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,6 +8,9 @@
"pid": "0x4136",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 36
+ },
"ws2812": {
"pin": "B15",
"driver": "pwm"
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
deleted file mode 100644
index 24c2465bff5..00000000000
--- a/keyboards/avalanche/v2/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 12
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index c96839ee394..62c284a8454 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
deleted file mode 100644
index 24c2465bff5..00000000000
--- a/keyboards/avalanche/v3/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 12
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 4c8a8e4f891..8cf8187df7f 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -22,6 +22,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 12,
"split_count": [7, 7]
},
"ws2812": {
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index 030111f9bbb..a6a00312faa 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -4,7 +4,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 64
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 10591c3129e..ae31c5e5604 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -25,6 +25,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 100,
"led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
"split_count": [32, 32]
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 584594c00de..cdd7d9e3f1b 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define RGBLED_NUM 9
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index eaa74b4fbb6..b8c9468f312 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -16,6 +16,9 @@
"bootmagic": {
"matrix": [4, 6]
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 05d7e7fb166..41190f44ed5 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -34,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json
index 38e619a0aa6..2cda8da3b1b 100644
--- a/keyboards/aves65/info.json
+++ b/keyboards/aves65/info.json
@@ -17,6 +17,9 @@
"esc_input": "D4",
"esc_output": "D0"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 52681e9a0b0..2ed9bc00ba5 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 }
#define PORT_EXPANDER_ADDRESS 0x20
-#define RGBLED_NUM 15
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index 471369812c2..39516649b17 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -13,6 +13,7 @@
"num_lock": "B3"
},
"rgblight": {
+ "led_count": 15,
"led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5]
},
"ws2812": {
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index c2b97562018..0cd4b1dcc01 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
/* RGB LED */
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 69 // Number of LEDs. backlight x69
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index 94fff43071d..6aaf47c1315 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 69,
"max_brightness": 120,
"split_count": [34, 35]
},
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 85ae15513e5..9ad471915fb 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -20,7 +20,6 @@
/* RGB LED */
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 80 // Number of LEDs. backlight x69
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 3cc2c19f8b9..cb3126f521a 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -27,6 +27,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 80,
"max_brightness": 128
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index 16f48788c1e..8604597ff8a 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -41,13 +41,10 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-/* RGB settings. */
-#define RGBLED_NUM 36
-
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 36
# define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 7270ee253a8..33c62549a10 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -18,13 +18,10 @@
#pragma once
-/* RGB settings. */
-#define RGBLED_NUM 58
-
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 58
# define RGB_MATRIX_SPLIT { 29, 29 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 95f1de9ff18..24a0262beeb 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -4,6 +4,7 @@
"pid": "0x1829"
},
"rgblight": {
+ "led_count": 58,
"split_count": [29, 29]
},
"layouts": {
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 76e75a04e6a..a7f9c943876 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -18,13 +18,10 @@
#pragma once
-/* RGB settings. */
-#define RGBLED_NUM 36
-
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 36
# define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 4373d641098..b4bb9ea78e5 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -4,6 +4,7 @@
"pid": "0x1830"
},
"rgblight": {
+ "led_count": 36,
"split_count": [18, 18]
},
"community_layouts": ["split_3x5_3"],
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 1bea55ef8e0..19ec26d1482 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -17,7 +17,6 @@
#pragma once
-#define RGBLED_NUM 38
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index 2256365a765..62db6d741f2 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -6,6 +6,7 @@
"pid": "0x1828"
},
"rgblight": {
+ "led_count": 38,
"split_count": [19, 19]
},
"ws2812": {
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 8774c0bbdea..ea18f4349e7 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -18,13 +18,10 @@
#pragma once
-/* RGB settings. */
-#define RGBLED_NUM 42
-
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 42
# define RGB_MATRIX_SPLIT { 21, 21 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 518cfbf801f..ec0433d3873 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -4,6 +4,7 @@
"pid": "0x1828"
},
"rgblight": {
+ "led_count": 42,
"split_count": [21, 21]
},
"community_layouts": ["split_3x6_3"],
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 4cad8086cd3..ee41aaec4e2 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -17,7 +17,6 @@
#pragma once
/* rgb num */
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index c9f403a0455..b3f9c6d2aab 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B7", "pin_b": "E6"}
]
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h
index 6c147e6368c..501b9fb83de 100755
--- a/keyboards/bemeier/bmek/config.h
+++ b/keyboards/bemeier/bmek/config.h
@@ -23,7 +23,6 @@
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_MODE_STATIC_GRADIENT
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
index c50cae166e2..a6aaad0c141 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
index 1ac54f5c79d..c422570e618 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
index c951ca8e43b..d060bb75e5a 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index ddc21dae308..d849732a072 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 16
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json
index 374e3377929..3f449b1ca25 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 8f990eb8ed0..179b1172430 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -24,9 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index 96ecd7010e1..67f27ad6129 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x0042",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 0962b26adde..4854b8fe292 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json
index 3755b0a854b..fca89f39ab2 100644
--- a/keyboards/bioi/f60/info.json
+++ b/keyboards/bioi/f60/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index d1039d08968..a3549153535 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
index 10a92de946b..13a55777a34 100644
--- a/keyboards/bioi/g60/info.json
+++ b/keyboards/bioi/g60/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 12
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 24ced1fc0a2..55023da704d 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -11,7 +11,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
index 2b835f7c482..92f9ed74a6f 100644
--- a/keyboards/bioi/g60ble/info.json
+++ b/keyboards/bioi/g60ble/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 8
},
+ "rgblight": {
+ "led_count": 36
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 93ab008b66a..69f952fd744 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
index c3fced4f783..d9fdd5cf0fe 100644
--- a/keyboards/bioi/morgan65/info.json
+++ b/keyboards/bioi/morgan65/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 12
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 13f5533c9f6..63a9661dc2d 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json
index a3a783b61ff..cbdc84e2257 100644
--- a/keyboards/bioi/s65/info.json
+++ b/keyboards/bioi/s65/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 12
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index 8afaae2f626..387afe71b60 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -18,7 +18,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json
index b83ade591fe..703112e6ed2 100644
--- a/keyboards/blackplum/info.json
+++ b/keyboards/blackplum/info.json
@@ -9,6 +9,7 @@
"device_version": "10.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 57ba70ec110..e9b841acbed 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -6,7 +6,6 @@
// RGB configuration
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 81
-# define RGBLED_NUM 81
#ifdef RGB_MATRIX_ENABLE
//# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index 9b796dcece8..8e9d0269d4a 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json
index 044d1e9e1a4..6ea001d29d7 100644
--- a/keyboards/blockey/info.json
+++ b/keyboards/blockey/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
index 41acb0598a1..40f2147bb6e 100644
--- a/keyboards/bluebell/swoop/config.h
+++ b/keyboards/bluebell/swoop/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_BREATHING
- #define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index c8e753bc0f8..6eb40cf6be2 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 36,
"max_brightness": 150,
"sleep": true,
"split_count": [18, 18]
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index a367b59dd31..81259c561af 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 15 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index 8c6253965be..ed7f0f67287 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -9,6 +9,9 @@
"pid": "0x5339",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index a1d1a3a5441..81259c561af 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 8259afcdcc9..01fcbac4886 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -9,6 +9,9 @@
"pid": "0x5338",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index a1d1a3a5441..81259c561af 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json
index 8a04fc121ee..9dfa734cd31 100644
--- a/keyboards/boardwalk/info.json
+++ b/keyboards/boardwalk/info.json
@@ -8,6 +8,9 @@
"pid": "0x5337",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
index 5984e77c9f0..a39d95e2b34 100644
--- a/keyboards/bolsa/bolsalice/config.h
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
index 8f71a4eff87..933bac1f7f5 100644
--- a/keyboards/bolsa/bolsalice/info.json
+++ b/keyboards/bolsa/bolsalice/info.json
@@ -7,6 +7,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 1dcbcdb5b87..eae2fc45542 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -26,7 +26,6 @@
#define LOCKING_RESYNC_ENABLE
/* Define RGBLED */
-#define RGBLED_NUM 1
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index 76d6cb41abf..5b30bdc00ca 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -23,6 +23,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "A5"
},
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index d609409cb56..4ed063f738d 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -96,8 +96,7 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 10
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index d50e92e17c9..5260ffabe14 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -15,6 +15,9 @@
{"pin_a": "B13", "pin_b": "B14"}
]
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 2dae864ddb2..401de718c15 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -16,7 +16,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
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
index ce9b4a7ec5f..748434020f8 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/info.json
@@ -8,6 +8,9 @@
"pid": "0x2004",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index 687baec5094..4c46487b4f8 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
/*
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
index e4a2d5b1d6c..5c5ca57a1aa 100644
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ b/keyboards/bt66tech/bt66tech60/info.json
@@ -19,6 +19,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index df83257ebd9..08f82e3306f 100644
--- a/keyboards/bubble75/hotswap/config.h
+++ b/keyboards/bubble75/hotswap/config.h
@@ -24,7 +24,6 @@
/* WS2812 RGB */
#ifdef RGB_MATRIX_ENABLE
-#define RGBLED_NUM 81
#define RGB_MATRIX_LED_COUNT 81
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index f5b8fc1864b..29e6fe29ffd 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -48,7 +48,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json
index 629d44a069e..f09ef1b10dc 100644
--- a/keyboards/buildakb/potato65/info.json
+++ b/keyboards/buildakb/potato65/info.json
@@ -12,6 +12,7 @@
"pin": "B1"
},
"rgblight": {
+ "led_count": 14,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index abba3271598..29ca85813ec 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json
index 03ebbb7273f..6b5d8b70e3a 100644
--- a/keyboards/buildakb/potato65hs/info.json
+++ b/keyboards/buildakb/potato65hs/info.json
@@ -12,6 +12,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index cfbf9cd7be4..719c9092cff 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
# 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
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
index 80b6deb8cdb..397948075a4 100644
--- a/keyboards/buildakb/potato65s/info.json
+++ b/keyboards/buildakb/potato65s/info.json
@@ -12,6 +12,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index e231d8d5ae1..c1712f8c731 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -7,7 +7,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
- #define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 6c958466a8b..5e5c0ac6d3d 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index bc9be65e9bc..a4da3320223 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 6ba52ece7e0..d0304cbada0 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -25,7 +25,6 @@
# 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
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 790a4284a0d..97dcf8d3cba 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index 61bbb842b15..0c2831edc86 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index aced1f333cc..e84ffc5e997 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index d3b73e31092..370fb9caf47 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 1296ad8dcc7..b5bcb93ba7f 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define WS2812_SPI SPID2
-#define RGBLED_NUM 22
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index 6fc7724b2b2..873c1c0c4dc 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,6 +8,9 @@
"pid": "0xA7A5",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 7e6ce9cdb95..6a11ca9db24 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -34,7 +34,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index ee584b24d24..183cd755e0a 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -12,6 +12,7 @@
"pin": "D4"
},
"rgblight": {
+ "led_count": 36,
"max_brightness": 230
},
"matrix_pins": {
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index a3fc30fc3d6..62e3dd37aaf 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -12,7 +12,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index 37fc5470f96..a84a6f6a064 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,9 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 20f73d95a2f..e84ffc5e997 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define WS2812_SPI SPID2
-#define RGBLED_NUM 20
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 99a4425752b..4c653de1be7 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -16,6 +16,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index 947648f59e7..e84ffc5e997 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index 13a1a2ef48a..d25c7ff036c 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 043ee2908a2..fb5b024240b 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 0ad5b9fbf63..a3a3452d9e8 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -17,6 +17,9 @@
"caps_lock": "B6",
"scroll_lock": "B2"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index aced1f333cc..e84ffc5e997 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 31aeca1e8d7..5ca3a78dca4 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 65ffa50103b..7f5841a2993 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index 23b667cf6cc..4db1d0f626a 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 2c1baa101d0..4a28aa7d86d 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index 3b54ee75b64..7fcab147bd4 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 65ffa50103b..7f5841a2993 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index 678ca4457a0..926c41d6d8d 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index eaf33bbfa06..ec1924949b7 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index dd4879b5beb..f972e729cdb 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index c8c8c93e51e..33acb298b92 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json
index 3b672f4f6d7..d933cc1989b 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index c8c8c93e51e..33acb298b92 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json
index dd2b78b9989..a0dd517d0cb 100644
--- a/keyboards/cannonkeys/ortho75/info.json
+++ b/keyboards/cannonkeys/ortho75/info.json
@@ -23,6 +23,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index c766c83f65a..33acb298b92 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index a1313242fa6..aa1ca1259fa 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index 0163604ead9..33acb298b92 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index 28841b48a68..ac4a7bd272f 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 29c78c23982..925046aa4f5 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 0980cb42751..df90b9db0ac 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 6aac0aefb44..21420a9f283 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 540327c6b8d..596ee91dc9e 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index d344ffaee68..60a4a44990c 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 22
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index 4d5d564e668..1caf1270694 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 6aac0aefb44..21420a9f283 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index e370e1acc0e..a2b7022f53c 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 1d8a04fe70c..2f8d64b7674 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB Glow */
-#define RGBLED_NUM 5 // Number of LEDs in your strip
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index c7d6660f132..cea21c4c0d0 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -18,6 +18,9 @@
"levels": 5,
"breathing": true
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index 8883514e5d2..70868bcecf0 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_TWINKLE
// #define RGBLIGHT_EFFECT_BREATHING
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index 61182fcb538..9b1934b1e30 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -12,6 +12,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 50
},
"matrix_pins": {
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 67f1f43c44b..9757f451ac8 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 24 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
index 3ea17a46e1c..fb00c8c6630 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"levels": 8
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index 98e0780698c..a7241744101 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -32,5 +32,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#endif
diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json
index 6ffd3117afc..0239b4f467a 100644
--- a/keyboards/catch22/info.json
+++ b/keyboards/catch22/info.json
@@ -6,6 +6,9 @@
"pid": "0xCA22",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h
index 20d95949a67..7024377ffc6 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -18,7 +18,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index f7f9ed0c643..d1fd939b164 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index 4ef27597b39..c48e14fee98 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -4,7 +4,6 @@
#pragma once
/* RGB */
-# define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index 502609402f9..bf39937bb4c 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,9 @@
"pid": "0x5335",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 530fa064135..7d2e15e875b 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -32,7 +32,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 29
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json
index 6b47a8f679d..62814963757 100644
--- a/keyboards/checkerboards/axon40/info.json
+++ b/keyboards/checkerboards/axon40/info.json
@@ -8,6 +8,9 @@
"pid": "0x1119",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 29
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index 0033db5d2bd..45b7c42344d 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -32,7 +32,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
diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json
index 3369eee53d4..86d2157b7ee 100644
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@@ -8,6 +8,9 @@
"pid": "0x3215",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index 3c52543d253..f3f7c9f1f50 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -30,7 +30,6 @@ Copyright 2021 Nathan Spears
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 9f44cfd41fe..7716c85ca94 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 50aa6985248..08b15568546 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -48,7 +48,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
index 30d8df7edbc..36e6a2f5f89 100644
--- a/keyboards/checkerboards/plexus75/info.json
+++ b/keyboards/checkerboards/plexus75/info.json
@@ -8,6 +8,9 @@
"pid": "0x5338",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
index bfa58783835..d1dd866518f 100644
--- a/keyboards/checkerboards/plexus75_he/config.h
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 18 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
index fc1dfc9fd5f..fe2e2960878 100644
--- a/keyboards/checkerboards/plexus75_he/info.json
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -8,6 +8,9 @@
"pid": "0x5339",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index 6fe6785edb0..81e5d3ca20f 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -49,7 +49,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
index 0f4394b87fa..bb8570311a5 100644
--- a/keyboards/checkerboards/pursuit40/info.json
+++ b/keyboards/checkerboards/pursuit40/info.json
@@ -8,6 +8,9 @@
"pid": "0x1620",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index efa8f93d3eb..ebf08ac001d 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index 262cd6e60cc..745e5b58ebd 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -8,6 +8,9 @@
"pid": "0x5340",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index 4136faaa7ae..827d1b990e6 100644
--- a/keyboards/checkerboards/quark_plus/config.h
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
index 0d47ec2ec47..4c535fd493b 100644
--- a/keyboards/checkerboards/quark_plus/info.json
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -8,6 +8,9 @@
"pid": "0x5344",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "C5"
},
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 514ce68f3f0..d1dd866518f 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index bd6233b2086..ef46a2fd10b 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -8,6 +8,9 @@
"pid": "0x5342",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index d11757cc15e..0a7d510b94f 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -28,7 +28,6 @@ Copyright 2022 Nathan Spears
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json
index 94d40e6645b..e1d61b8cf3e 100644
--- a/keyboards/checkerboards/snop60/info.json
+++ b/keyboards/checkerboards/snop60/info.json
@@ -23,6 +23,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 788fbe39a99..d1dd866518f 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json
index 7d49bdb5b45..2adf87d676d 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/info.json
+++ b/keyboards/checkerboards/ud40_ortho_alt/info.json
@@ -8,6 +8,9 @@
"pid": "0x7030",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index 21aeb17d77d..c73bdee2e81 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
# 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
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 1b2fadd2a9c..a57c1904e27 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -19,6 +19,9 @@
"scroll_lock": "F7",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index e463e1d6c70..ab74e906c4e 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 37038b214fd..b1ae3a00290 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -18,6 +18,9 @@
"scroll_lock": "F4",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index ddb9102d365..e842414a753 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#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
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index ac32d5f8eab..4a4d060f477 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 4c66b113e7b..e842414a753 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 8c35532c321..674f65e4dda 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -21,6 +21,9 @@
"scroll_lock": "F4",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 71b01464378..6460a7cf8a9 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
index fa8180e5af1..464136b5d35 100644
--- a/keyboards/cheshire/curiosity/info.json
+++ b/keyboards/cheshire/curiosity/info.json
@@ -7,6 +7,9 @@
"pid": "0x0FAD",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index c1452d0c984..a12ddee9aec 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index 6344cc1b5ad..79f87057364 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index bb51142311f..546d3a95202 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* Lightbar pin and LED count definitions*/
-#define RGBLED_NUM 13
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index f9fd74acfe2..186f98578ac 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -8,6 +8,9 @@
"pid": "0x6B7A",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 13
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index efdcb96c5de..b34fb3e42f6 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json
index 68f6f5f1ca2..bef7d850e8b 100644
--- a/keyboards/ck60i/info.json
+++ b/keyboards/ck60i/info.json
@@ -24,6 +24,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index 6e151805377..33c3417b7c0 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index ffb30e0b542..453e7d2bae1 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index fa98bca8346..d2d6fd70303 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 33
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 4c0cd862bd3..5a10f0e4aee 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -12,6 +12,7 @@
"pin": "C6"
},
"rgblight": {
+ "led_count": 33,
"max_brightness": 32,
"sleep": true,
"led_map": [0, 1, 2, 3, 7, 6, 5, 4, 8, 9, 10, 11, 15, 14, 13, 12, 16, 17, 18, 19, 22, 21, 20, 25, 24, 23, 26, 27, 28, 29, 30, 31, 32]
diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index c9da0d411b6..3a094c2fd10 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -18,8 +18,7 @@
#pragma once
#define WS2812_PIO_USE_PIO1
-#define RGBLED_NUM 48
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 48
#define RGB_MATRIX_SPLIT \
{ 24, 24 }
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index 0a4d8c84b77..e7fc529592f 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -18,8 +18,7 @@
#pragma once
#define WS2812_PIO_USE_PIO1
-#define RGBLED_NUM 54
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 54
#define SPLIT_TRANSPORT_MIRROR
#define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 2d51f481fc8..737cabbf56b 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json
index 1ca20cb4857..a1912c90a0d 100644
--- a/keyboards/coseyfannitutti/mullet/info.json
+++ b/keyboards/coseyfannitutti/mullet/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h
index c97f9dbac4c..1d30de51db1 100644
--- a/keyboards/cosmo65/config.h
+++ b/keyboards/cosmo65/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see http://www.gnu.org/licenses/.
/* RGB Lighting */
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json
index d20de266e47..00d6efe855b 100644
--- a/keyboards/cosmo65/info.json
+++ b/keyboards/cosmo65/info.json
@@ -8,6 +8,9 @@
"pid": "0x6331",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 716f1bfc58c..4bb9c236a10 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
// Enable RGB backlight
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json
index e5dc4449a32..164c9252649 100644
--- a/keyboards/cozykeys/bloomer/info.json
+++ b/keyboards/cozykeys/bloomer/info.json
@@ -8,6 +8,7 @@
"pid": "0x1191"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index e73e2d3cdf1..a78b180f3ea 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 0f75255c7a2..a0ed755a96a 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.3"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index d6df5fb7a0c..cd06b240253 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json
index 9cf869c0bd7..b6c37eb4acb 100644
--- a/keyboards/craftwalk/info.json
+++ b/keyboards/craftwalk/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 19,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index 43784354713..64a378d399a 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -25,5 +25,4 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 3
#endif
diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json
index 0d4d38d4ead..4f405040590 100644
--- a/keyboards/crawlpad/info.json
+++ b/keyboards/crawlpad/info.json
@@ -8,6 +8,9 @@
"pid": "0x6070",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 5f41e50b140..fbaa480512d 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 84
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json
index c6a74147e0f..d3ce815c364 100644
--- a/keyboards/crazy_keyboard_68/info.json
+++ b/keyboards/crazy_keyboard_68/info.json
@@ -18,6 +18,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 84,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index 455f179e900..46db11318f7 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -31,13 +31,10 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-
-# define RGBLED_NUM 54
#endif
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT \
{ 27, 27 }
# define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index 1de40c03951..3b269a5051e 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -6,6 +6,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 54,
"split_count": [27, 27]
},
"ws2812": {
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 422f5eb5cd3..60a49100e3f 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,13 +18,8 @@ along with this program. If not, see .
#pragma once
-#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-#endif
-
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT \
{ 27, 27 }
# define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index e9114e903ca..48a27d11f34 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -6,6 +6,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 54,
"split_count": [27, 27]
},
"ws2812": {
diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h
index ecdef4acaa1..3dc7c6c43a3 100644
--- a/keyboards/crypt_macro/config.h
+++ b/keyboards/crypt_macro/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 3
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index 8dcd2e264ea..cd7fdde22dd 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -8,6 +8,9 @@
"pid": "0x434D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 11
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index d894b55edfc..7358dfab6f4 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index 4915497bb04..7d9eb7c9779 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -12,6 +12,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 13,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index 126caeab6af..604c3abad0b 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 0ee3d9a5370..a5358cdee47 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -12,6 +12,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 13,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index f14a164f57b..fb684c7159e 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json
index 89da7fa8b37..cda9da7e821 100644
--- a/keyboards/cx60/info.json
+++ b/keyboards/cx60/info.json
@@ -21,6 +21,9 @@
"caps_lock": "B5",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index 7a7d3584de7..c82ef78de8b 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json
index c8004a2bae1..1faaf2becf2 100644
--- a/keyboards/db/db63/info.json
+++ b/keyboards/db/db63/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index 692f679d24f..36c6f90de17 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 15
#define RGB_MATRIX_LED_COUNT 15
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index fb3203433b4..62c12ff410c 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
index 6caf40a265b..10cc8224367 100644
--- a/keyboards/delikeeb/flatbread60/info.json
+++ b/keyboards/delikeeb/flatbread60/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 19,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index 09f3bb3f875..cfc6948813e 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
index 88486929d3a..1e698cb9cbf 100644
--- a/keyboards/delikeeb/vaguettelite/info.json
+++ b/keyboards/delikeeb/vaguettelite/info.json
@@ -20,6 +20,7 @@
]
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 3f50b5bb50b..06dc1809b3d 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define B7_AUDIO
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
index 3e48aaa6f29..4e123191b1a 100644
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -4,6 +4,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 3f50b5bb50b..06dc1809b3d 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define B7_AUDIO
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
index 668d5334048..fc59f8c756b 100644
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -4,6 +4,7 @@
"device_version": "0.0.2"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 7f0d329f52b..4e1bd0e8744 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index ab4f3220503..c7eab26a772 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.3"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index 4d2439ad3c1..9b7700e0139 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
index 857fa12e9a9..d583f3bb65b 100644
--- a/keyboards/deltasplit75/v2/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -15,6 +15,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index 2d3108fae32..bd58363c4bc 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 21
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 88c93813190..f7554aad547 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -17,6 +17,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 21,
"max_brightness": 153
},
"processor": "atmega32u4",
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 7ca2b8cded0..f891e062261 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,8 +24,6 @@ along with this program. If not, see .
// #define MASTER_RIGHT
// #define EE_HANDS
-#define RGBLED_NUM 7
-
#ifndef IOS_DEVICE_ENABLE
#if RGBLED_NUM <= 7
#define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 1813baa2410..fc5d4fa26aa 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 2a1bafaacf7..cc43876148b 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-//Number of RGB LEDs
-#define RGBLED_NUM 3
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index 52fc9f40ea2..aeeb19299e2 100644
--- a/keyboards/dmqdesign/spin/info.json
+++ b/keyboards/dmqdesign/spin/info.json
@@ -20,6 +20,9 @@
{"pin_a": "D6", "pin_b": "D4"}
]
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 21160e0a8da..03cc7e8735b 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 15
#define RGBLIGHT_VAL_STEP 15
diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json
index 9267a981412..21d10f4b9e0 100644
--- a/keyboards/do60/info.json
+++ b/keyboards/do60/info.json
@@ -21,6 +21,9 @@
"caps_lock": "B2",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "F5"
},
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 398b0be3c84..ace3594f483 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json
index 98c878d12fc..263174c8bac 100644
--- a/keyboards/donutcables/budget96/info.json
+++ b/keyboards/donutcables/budget96/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index a73678faf25..e16c8b7f5a8 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -18,7 +18,3 @@
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 8 // Number of LEDs
-#endif
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index 367a9b7d72c..2b1f08ebb3c 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -18,6 +18,9 @@
{"pin_a": "F5", "pin_b": "F6", "resolution": 2}
]
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index a73678faf25..e16c8b7f5a8 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -18,7 +18,3 @@
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 8 // Number of LEDs
-#endif
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index 00d0fc64521..1aff0eccd38 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/keyboards/doodboard/duckboard_r2/info.json
@@ -18,6 +18,9 @@
{"pin_a": "F6", "pin_b": "F5", "resolution": 2}
]
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 35608a3323c..a18b4847465 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -21,8 +21,6 @@ along with this program. If not, see .
// #define USE_I2C
-#define RGBLED_NUM 2
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
index 49c3ac1bfac..ea53bfb9156 100644
--- a/keyboards/doppelganger/info.json
+++ b/keyboards/doppelganger/info.json
@@ -23,6 +23,7 @@
}
},
"rgblight": {
+ "led_count": 2,
"split_count": [1, 1]
},
"ws2812": {
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index cca3e4d26fb..e18a2313807 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -70,8 +70,6 @@ along with this program. If not, see .
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#define RGBLED_NUM 67
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index b1518cb5fb2..d84e1cd9f16 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -33,7 +33,6 @@
//#define NO_PRINT
//rgb light setting
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
index 625ca2a2385..810fd5176cd 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -8,6 +8,9 @@
"pid": "0x00BE",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 697ac4ccb05..426f7a3a38a 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
index b5d4fe65352..cc88dcd07e9 100644
--- a/keyboards/draculad/info.json
+++ b/keyboards/draculad/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 10,
"sleep": true,
"split": true
},
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 4b58b3fffc4..0d3292e5224 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
//Underglow
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index f20d63a7258..adf75b578c2 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -20,6 +20,7 @@
]
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 31f15c1fbd7..1d8430bc540 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
// ws2812 options
- #define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json
index 4b09ad0b552..8ff6d43c44e 100644
--- a/keyboards/draytronics/elise/info.json
+++ b/keyboards/draytronics/elise/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index 78e3e064600..1d8430bc540 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
// ws2812 options
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json
index be0f874947b..972d0b690bc 100644
--- a/keyboards/draytronics/elise_v2/info.json
+++ b/keyboards/draytronics/elise_v2/info.json
@@ -9,6 +9,7 @@
"device_version": "2.0.0"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index e39099ef56f..e1fc4b658cc 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
#define TAPPING_TERM 200
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
index 4d6019ddba0..0352ab47603 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/info.json
@@ -12,6 +12,9 @@
"bootmagic": {
"matrix": [4, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 95459e67b1a..426f673b05f 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 23
/*
* Feature disable options
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index 287ab0ac4ab..8c0a02dd7b4 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index cb5a419f566..f6430999ac4 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
#define TAPPING_TERM 200
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
index 296820d7caf..6c77c26bf06 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index 9b557edaba3..4859dcadda2 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index 8186ce878ef..2f07bbcb6d9 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 2530cedc0f0..f1a6bd1515d 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index f3bd30fbe57..53c8c629a65 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index e8d87e0719d..aea6e224b65 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 18
#define TAPPING_TERM 200
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
index eff1e5f88cf..d7de16e7c94 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/info.json
@@ -16,6 +16,9 @@
"bootmagic": {
"matrix": [4, 10]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index 13f2d761398..ed75effe400 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/keyboards/duck/tcv3/config.h
@@ -34,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index 69f1033d222..6b4a6505963 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/info.json
@@ -11,6 +11,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index 76d08b55360..f5c1cdb6136 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -10,7 +10,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
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 23d17596d90..33385890a10 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -22,6 +22,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index 043d5290709..b2df897063c 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -25,7 +25,6 @@
# 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
diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json
index d91a78316cc..a511f5b474e 100644
--- a/keyboards/dztech/bocc/info.json
+++ b/keyboards/dztech/bocc/info.json
@@ -18,6 +18,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 9ebdcf550a5..248207e92d4 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
#define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json
index cb488d8b750..bc0732c3e6d 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index d02f8371691..68d7853e55c 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -27,7 +27,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
#define RGBLIGHT_DEFAULT_SPD 10
-#define RGBLED_NUM 30
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index 9fb8bc22ed1..5da1f83d25e 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -21,6 +21,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 30,
"max_brightness": 130
},
"processor": "atmega32u4",
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index d471ec8c583..63a2908eb10 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index 844a4718366..5b4fb20d585 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 5ba690ee955..877ce5ac96c 100644
--- a/keyboards/eason/aeroboard/config.h
+++ b/keyboards/eason/aeroboard/config.h
@@ -13,7 +13,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 83de4d87172..68707d82fa4 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index cfe3e84fda0..1f82ce33733 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 6496a6be719..2be92e58405 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "F6"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index b160d9ccb7d..c8ecae7fc65 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
/* Underglow */
-#define RGBLED_NUM 17
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index 5c3fb8d4cce..aef759e29a2 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 17,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 6677c4587e8..44515c09139 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
/*
* Enable RGB Underlighting
*/
-#define RGBLED_NUM 15
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index d7275dfa707..7e8d1a755d6 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -11,6 +11,9 @@
"rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index b9b6b86c988..54e18096ff3 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* RGB Underglow */
-#define RGBLED_NUM 32
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index 63ca3aa15dd..64be97d95b4 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -6,6 +6,9 @@
"pid": "0x2408",
"device_version": "0.0.7"
},
+ "rgblight": {
+ "led_count": 32
+ },
"ws2812": {
"pin": "A10",
"driver": "pwm"
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index e59dbc15e65..23ca0b18867 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -10,7 +10,6 @@
/*
* Enable RGB Underlighting
*/
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
index 0c8bb289b06..07e58f1e30a 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/info.json
@@ -13,6 +13,9 @@
"rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h
index f37d43dd2f6..1958d0a9320 100644
--- a/keyboards/edinburgh41/config.h
+++ b/keyboards/edinburgh41/config.h
@@ -3,10 +3,6 @@
#pragma once
-// Underglow LED settings
-
-#define RGBLED_NUM 10
-
// Thumbstick settings
#define ANALOG_JOYSTICK_X_AXIS_PIN B5
#define ANALOG_JOYSTICK_Y_AXIS_PIN B6
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
index 14e4950c4ab..745710f92f3 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/info.json
@@ -10,6 +10,9 @@
"pid": "0x0000",
"vid": "0xFEED"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index 51511b7f120..f0f88b0a380 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index cfc944d8471..10cf44b2cc0 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 36,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index d642bc04f8e..2ae0d24fa4d 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
# define AUDIO_DAC_SAMPLE_MAX 4095U
#endif
-# define RGBLED_NUM 38
# define RGBLIGHT_HUE_STEP 4
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 982acdbc7fa..8a6114bb6dd 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 38,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index ebc0b104974..60f5551a3b9 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 54 // backlight x42 + underglow x12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -34,7 +33,7 @@ along with this program. If not, see .
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT { 27, 27 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_MATRIX_HUE_STEP RGBLIGHT_HUE_STEP
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index bcfc374531c..341d1973324 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 54,
"max_brightness": 170,
"split_count": [27, 27]
},
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index bf53058d523..12ec9ebebbd 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 84
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
index 6c8825c915e..3c323756074 100644
--- a/keyboards/ep/comsn/mollydooker/info.json
+++ b/keyboards/ep/comsn/mollydooker/info.json
@@ -16,6 +16,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 84,
"max_brightness": 35
},
"processor": "atmega32u4",
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
deleted file mode 100644
index 7846e281545..00000000000
--- a/keyboards/ergoslab/rev1/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2019 Tom Saleeba
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 2 // Number of LEDs
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index d786799810d..e92dd4dccc8 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index 326a8f8ffe7..790a2696fbe 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
index 01fd3265e94..77aecec0ed1 100644
--- a/keyboards/ergotravel/rev1/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index 01118712d2d..8a96604e01c 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 51
#define RGBLIGHT_HUE_STEP 20
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json
index ba31f9c260b..439487cb2bc 100644
--- a/keyboards/esca/getawayvan/info.json
+++ b/keyboards/esca/getawayvan/info.json
@@ -17,6 +17,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 51,
"max_brightness": 128
},
"processor": "STM32F072",
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index 01118712d2d..8a96604e01c 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 51
#define RGBLIGHT_HUE_STEP 20
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json
index e39d2b4c22d..bbc1a3fb5bc 100644
--- a/keyboards/esca/getawayvan_f042/info.json
+++ b/keyboards/esca/getawayvan_f042/info.json
@@ -17,6 +17,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 51,
"max_brightness": 128
},
"processor": "STM32F042",
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 096d6598a3e..2dcb4ed6657 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index 7dd1e43108c..b700d04c3fc 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -17,6 +17,7 @@
"matrix": [0, 1]
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index 5b9a95dddbf..a7defee3867 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
index fd72f7845ff..f95a5bc1d19 100644
--- a/keyboards/evolv/info.json
+++ b/keyboards/evolv/info.json
@@ -22,6 +22,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 352b89dad95..e14ecadbf09 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -21,5 +21,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 1 // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index b1642612eac..8c5720d0c48 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -18,6 +18,9 @@
"levels": 4,
"breathing": true
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 5f37dc519b0..72c1b9dc462 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6 // Number of LEDs in your strip
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index dc9b13961f2..7cf50a0a94f 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -18,6 +18,9 @@
"levels": 5,
"breathing": true
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F5"
},
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index abfa0fe63d0..d60691c6ab1 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json
index a58c3a52330..be993ea2830 100644
--- a/keyboards/evyd13/eon65/info.json
+++ b/keyboards/evyd13/eon65/info.json
@@ -13,6 +13,9 @@
"rows": ["D3", "D5", "B1", "B2", "B3"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 04247c7e73c..d60691c6ab1 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json
index fc134b502fb..9698650bacd 100644
--- a/keyboards/evyd13/eon87/info.json
+++ b/keyboards/evyd13/eon87/info.json
@@ -13,6 +13,9 @@
"rows": ["B1", "B2", "B3", "D4", "D1", "D5"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index e17b637a1ee..cfa335c00b7 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -34,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json
index d1195a597be..fa4fd552e9f 100644
--- a/keyboards/evyd13/ta65/info.json
+++ b/keyboards/evyd13/ta65/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B2", "pin_b": "B1"}
]
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 1f7440aa201..1fe33fc4378 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -29,4 +29,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index 621be942325..5ac4bfb7872 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -18,6 +18,9 @@
"esc_output": "F0",
"led": "B1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 9d31e13dcb9..1667b7f57ae 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -32,7 +32,6 @@
# 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
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 3fab8ca8abd..57606a11b76 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -21,6 +21,9 @@
"caps_lock": "B6",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index c6acec26587..e5f87797cbe 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -5,7 +5,6 @@
#pragma once
//rgb light setting
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 0381b209a8f..04b4b9db390 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -16,6 +16,9 @@
"rows": ["F1", "F4", "F5", "F6", "D6"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 8c0ffda30b5..4ae71a39d54 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index 8fbbcbfea3f..b5feebc7209 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -23,6 +23,9 @@
"caps_lock": "B7",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index bb3f00287eb..b8be4dca5f4 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index c0d2ffa868b..29bf63bf521 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -15,6 +15,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 6e9255bebb0..4ae71a39d54 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json
index eef3f67847e..c1aa0e65126 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -19,6 +19,9 @@
"breathing": true,
"breathing_period": 3
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index bb3f00287eb..b8be4dca5f4 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 622d7db5644..56c4fbdf57b 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -15,6 +15,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 896eb97b255..401de718c15 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -16,7 +16,6 @@
#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
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index 42ec77a9fb6..4c7873f4bbc 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 6
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index af36d4d9942..b978eba79ab 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index 6e6b0c9a0d9..b24326a30c9 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index de75f0a8cc6..4c462b5d599 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 981c5f95067..24b9f14567f 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index 533e1cd6fc8..42507fdb989 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index b062e20b682..1441c7581fd 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json
index 9f0f3e39450..ef4b00b9051 100644
--- a/keyboards/exent/info.json
+++ b/keyboards/exent/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 0c762f345cb..cddeedaa771 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index 65fdbd22ec1..39e1fd5ddae 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -17,6 +17,7 @@
"pin": "B6"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
index 7045ef547ad..ee731fdea84 100644
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
index e829d2eee61..ffa3fb820bf 100644
--- a/keyboards/eyeohdesigns/theboulevard/info.json
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index ddc21dae308..d849732a072 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 16
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json
index 514c64f2c38..d28bd4447e9 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 4e5ad265833..1fe5f41924a 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -40,4 +40,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index e51283eb192..f92926b72f4 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -12,6 +12,9 @@
"rows": ["B1", "B2", "B3", "C6", "C7"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 23a2f15d994..450a31173aa 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
- #define RGBLED_NUM 8
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json
index 356c148d8e5..645efa85513 100644
--- a/keyboards/ffkeebs/puca/info.json
+++ b/keyboards/ffkeebs/puca/info.json
@@ -18,6 +18,9 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index 4aa0cd52ea4..cf9d7a98509 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB */
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 6e026ecc589..c6a186387d0 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -13,6 +13,9 @@
"rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 4204f1d1290..edc330d4fb8 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index ba9239629cc..387cdbe99c6 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "C7"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 3b205ce76fa..5f5f69421c3 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 7b468da941c..7772d751d66 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "C7"
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 3b205ce76fa..5f5f69421c3 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index 27c3ece3ba2..d073372ef66 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -13,6 +13,9 @@
"rows": ["F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 4131a884292..b14096f20a6 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB */
-#define RGBLED_NUM 87
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index 415405a9e82..0016552ab59 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -21,6 +21,7 @@
"pin": "C2"
},
"rgblight": {
+ "led_count": 87,
"max_brightness": 86
},
"processor": "at90usb646",
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 5fa5e84acd3..f0f64903bec 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define Badge RGB */
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index 058cb4ea23b..f57ee482dc8 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -13,6 +13,9 @@
"rows": ["F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 89e8c6c2213..e83868463af 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 7e99f1bd106..1f1078be697 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -17,6 +17,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 108
},
"processor": "atmega32u4",
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 1292feb117b..14307e1e34d 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index 689f396b3ed..403d4801d12 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -17,6 +17,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 108
},
"processor": "atmega32u4",
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 569d563e450..d0ae4b866f2 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB */
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index 2f1bea8698a..917befc2e38 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 172
},
"processor": "at90usb646",
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index be5bee6e440..089b49ea03a 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB */
-#define RGBLED_NUM 1
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 733be971de6..bc17ac108b0 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -13,6 +13,9 @@
"rows": ["B0", "B1", "C7", "C6", "B6"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index 89e8c6c2213..e83868463af 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index b07464ad364..308ab23457a 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -17,6 +17,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 108
},
"processor": "atmega32u4",
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 89e8c6c2213..e83868463af 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index 6e9a5bf8219..4b2edf7d735 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -17,6 +17,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 108
},
"processor": "atmega32u4",
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 5932113c947..e83868463af 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index 098bad3fcf7..07696008246 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -17,6 +17,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 96
},
"processor": "atmega32u4",
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index ddf4546bbb2..f633202f975 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
@@ -34,5 +34,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#endif
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 095f8284e4f..13a3500853b 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -7,6 +7,9 @@
"pid": "0xB195",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index 34197c8578d..64f691e305d 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 18 // Number of LEDs in your strip
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json
index c2ff091acec..81237e2cbfe 100644
--- a/keyboards/fleuron/info.json
+++ b/keyboards/fleuron/info.json
@@ -12,6 +12,9 @@
"rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index eff51d94c93..fe922532efa 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 0
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 02c55753339..218d500eefa 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -18,6 +18,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 0,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index e3d3aa97cf7..7d8e1d90f17 100644
--- a/keyboards/flxlb/zplit/config.h
+++ b/keyboards/flxlb/zplit/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
index fb30fe2ab75..a4dfb714b7b 100644
--- a/keyboards/flxlb/zplit/info.json
+++ b/keyboards/flxlb/zplit/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 16,
"led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index d13ea1c8450..5dec5df1f12 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -27,10 +27,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 18 // Number of LEDs */
-#endif
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index 175e621e230..0ae02161cd5 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -17,6 +17,9 @@
"pin": "B5",
"levels": 9
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 66a1cc7dc59..cd6f00bb500 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json
index f7dd9ad6b5c..c3686813006 100644
--- a/keyboards/foxlab/key65/hotswap/info.json
+++ b/keyboards/foxlab/key65/hotswap/info.json
@@ -18,6 +18,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index b4b7a44be10..cd6f00bb500 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json
index 49a770dddd8..1d907b38296 100644
--- a/keyboards/foxlab/key65/universal/info.json
+++ b/keyboards/foxlab/key65/universal/info.json
@@ -18,6 +18,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index 0e63b25a0cc..1ff87744373 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index b29931a796d..8908ef057bc 100644
--- a/keyboards/foxlab/leaf60/hotswap/info.json
+++ b/keyboards/foxlab/leaf60/hotswap/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index 0e63b25a0cc..1ff87744373 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json
index 6c569f5cc67..84fa69d0cfe 100644
--- a/keyboards/foxlab/leaf60/universal/info.json
+++ b/keyboards/foxlab/leaf60/universal/info.json
@@ -22,6 +22,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index d2df18997f3..a6a4918bd14 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
//#define RGBLIGHT_HUE_STEP 8
//#define RGBLIGHT_SAT_STEP 8
//#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json
index f5b8a7eb0c0..b19e3c31041 100644
--- a/keyboards/foxlab/time80/info.json
+++ b/keyboards/foxlab/time80/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
index d0456680ffa..7442bb0c1af 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json
index b9509a052c6..c28c62e8c65 100644
--- a/keyboards/foxlab/time_re/hotswap/info.json
+++ b/keyboards/foxlab/time_re/hotswap/info.json
@@ -24,6 +24,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 5,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index d0456680ffa..7442bb0c1af 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json
index 0d4b301695d..a4d42be2a83 100644
--- a/keyboards/foxlab/time_re/universal/info.json
+++ b/keyboards/foxlab/time_re/universal/info.json
@@ -20,6 +20,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 5,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index 9ffcce41788..eee629f6884 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define RGBLED_NUM 8
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index 0a6fde88ba8..8c95e3972ef 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -25,6 +25,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h
index d103b66e075..c56f9050505 100644
--- a/keyboards/ft/mars65/config.h
+++ b/keyboards/ft/mars65/config.h
@@ -3,7 +3,6 @@
#pragma once
- #define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index caede3a6262..08efe50b612 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -20,6 +20,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 130,
"sleep": true
},
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 116c09d6ac7..d849732a072 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 20
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json
index 5801c63a237..80c47565ad0 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h
index ba2a3450455..0d7d5228d2e 100644
--- a/keyboards/gami_studio/lex60/config.h
+++ b/keyboards/gami_studio/lex60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json
index b5b59df7aac..f63f6e2c318 100644
--- a/keyboards/gami_studio/lex60/info.json
+++ b/keyboards/gami_studio/lex60/info.json
@@ -8,6 +8,9 @@
"pid": "0x0160",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 344ccf3fffc..02f5a8a966c 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 42
#define RGB_MATRIX_LED_COUNT 42
// PWM RGB Underglow Defines
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 1fbb35b3a23..b2711cfa1f4 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 6432d8eb45b..63319f2ea29 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 4
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index 67025fc1f4a..55f15856d20 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json
index f5fca7763bb..b2a516cbae6 100644
--- a/keyboards/gh60/v1p3/info.json
+++ b/keyboards/gh60/v1p3/info.json
@@ -18,6 +18,7 @@
"levels": 15
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 9cd6e7be5a0..4156d04e552 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 17
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json
index 9a684c2840f..f51efa51052 100644
--- a/keyboards/ghs/rar/info.json
+++ b/keyboards/ghs/rar/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
index 1471806690b..bc6fd53b1fb 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/config.h
@@ -34,8 +34,6 @@ along with this program. If not, see .
#define SPLIT_USB_DETECT
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 123
-
# define RGBLIGHT_LAYERS
// By default, LEDs of the buttons which are pressed turn on.
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 7274505f9b0..388d0a1ad2a 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 123,
"max_brightness": 80,
"led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
},
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index ff3413e3700..4753a5c6f26 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json
index 1f344fe50df..e70f9c59d97 100644
--- a/keyboards/gkeyboard/gkb_m16/info.json
+++ b/keyboards/gkeyboard/gkb_m16/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
index 49205e59d15..7adc4e10c3e 100644
--- a/keyboards/gl516/j73gl/config.h
+++ b/keyboards/gl516/j73gl/config.h
@@ -31,10 +31,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 73
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index a34c1e6c4cb..2650356f1f7 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -8,6 +8,9 @@
"pid": "0xE8D0",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 73
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
index cd919a72c47..138e9d1063f 100644
--- a/keyboards/gl516/n51gl/config.h
+++ b/keyboards/gl516/n51gl/config.h
@@ -31,10 +31,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 15
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index 9da8930c60b..c6fa2a1cf64 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -8,6 +8,9 @@
"pid": "0xE8CF",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index 4de4c54aa7d..c3511821d1d 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/config.h
@@ -5,7 +5,6 @@
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 4bc6457b5b4..d0d700dd9e4 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -12,6 +12,7 @@
"pin": "B10"
},
"rgblight": {
+ "led_count": 1,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
index 58cc50aea0b..6f0ccc93099 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index 39cbbbaaf74..2154483373c 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -12,6 +12,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 22,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index aee484c137a..bcf26130c0d 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
index fd7c89197de..b73f39ff2e7 100644
--- a/keyboards/gray_studio/cod67/info.json
+++ b/keyboards/gray_studio/cod67/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
index 41df8a357d2..d849732a072 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 5
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json
index 138b1bfe5c9..c1d7533a7d7 100644
--- a/keyboards/gray_studio/hb85/info.json
+++ b/keyboards/gray_studio/hb85/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 161ee714d60..39ae589193f 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json
index e5a692e536f..c1f5a1d0e5d 100644
--- a/keyboards/gray_studio/space65/info.json
+++ b/keyboards/gray_studio/space65/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index aed6b1ebbc6..33b584967af 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -4,7 +4,6 @@
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index 301f004f0b9..7d62cf2e355 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -12,6 +12,7 @@
"pin": "B10"
},
"rgblight": {
+ "led_count": 5,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index 51091e4ebc7..6f60b19ce12 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json
index 673ae773aba..17781d5d67c 100644
--- a/keyboards/gray_studio/think65/hotswap/info.json
+++ b/keyboards/gray_studio/think65/hotswap/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
index 51091e4ebc7..6f60b19ce12 100644
--- a/keyboards/gray_studio/think65/solder/config.h
+++ b/keyboards/gray_studio/think65/solder/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json
index befbd79605c..65cb2fe4994 100644
--- a/keyboards/gray_studio/think65/solder/info.json
+++ b/keyboards/gray_studio/think65/solder/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index 517fe500c2b..54a08938038 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json
index 804ab367c63..7680f059753 100644
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@@ -13,6 +13,7 @@
"rows": ["F0"]
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 9891423e3fe..3560f972fff 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 15
#define RGBLIGHT_VAL_STEP 15
diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 6e8e2e61448..a7f8a48bdde 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -13,6 +13,9 @@
"rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index 7b7acf32b64..dbdda7b1455 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -30,6 +30,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
index 612d3af50aa..60edaa9478b 100644
--- a/keyboards/hadron/ver2/info.json
+++ b/keyboards/hadron/ver2/info.json
@@ -7,6 +7,9 @@
"rows": ["D7", "E6", "B4", "B5", "B6"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 02e4116bb60..be315e668a6 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -118,8 +118,7 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 10
// #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 753a9676ceb..466dafbc534 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -15,6 +15,9 @@
{"pin_a": "B13", "pin_b": "B14"}
]
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 1b0c2bb1541..4113f03bc8f 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index 39b26c763b0..1e5cdfcf552 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 10,
"sleep": true,
"split_count": [5, 5]
},
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index 96a6764ceb1..a9bb7a15e5f 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -17,8 +17,6 @@
#define TAP_CODE_DELAY 10 // tap_code function delay for register and unregister
-#define RGBLED_NUM 22
-
/* animations enabled */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index 763d5734b13..bc160671ee5 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -22,6 +22,7 @@
"pin": "A10"
},
"rgblight": {
+ "led_count": 22,
"max_brightness": 225,
"sleep": true
},
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 53033ad4f3c..d8999dc37ae 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 10
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 5bc9833fa52..6faf7f579fa 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,6 +8,9 @@
"pid": "0x0037",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 89532fd32b2..98b6190067b 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index cb1d6f6f0a6..7bb335a6070 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,9 @@
"pid": "0x040D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "C6"
},
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 6a2a8fe30b8..31efed8fc08 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 5991fdbac15..26e73a8d88f 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 1e0a226403a..519da7e4424 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -42,8 +42,6 @@ along with this program. If not, see .
/* Enables This makes it easier for fast typists to use dual-function keys */
#define PERMISSIVE_HOLD
-#define RGBLED_NUM 28 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index b4bdbc84200..910a628ca6a 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 28,
"split": true,
"max_brightness": 120
},
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index 677804cbe9b..4d245e80e4b 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -22,5 +22,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 4
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index 2cb9a7a4d94..0bbdefe9216 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 7
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 8cafa3c6f3b..be60d6b5221 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -36,8 +36,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 16
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json
index 1f1c2a2cf98..1475c808f37 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -12,6 +12,9 @@
"pin": "B8",
"breathing": true
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "A7",
"driver": "spi"
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index b315e309ae3..70aafa3bfd4 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -16,7 +16,4 @@
#pragma once
-/* LEDs are not used in the standard 64key configuration. */
-#define RGBLED_NUM 0
-
#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 1bca5a6fa48..2786c334519 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,9 @@
"pid": "0x3632",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 0
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index e73c52a4016..617bbd1f950 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index 7b107225a5e..9a8f73071ef 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index e73c52a4016..617bbd1f950 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index bd5b59f6e70..3c613d7ff65 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index e73c52a4016..617bbd1f950 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 15bccbf8d03..973d04481cd 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index 5206212fc5a..3756baa8562 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index 7a86325b327..64f69ac4be4 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
index d80b689beea..ceb0d42000f 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 42
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index e252fd85cc8..06ad72c5ec4 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 42,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index 813b5650369..3dc7c6c43a3 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 3
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index 47eaab67a73..ca4ab5483db 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -8,6 +8,9 @@
"pid": "0x432A",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 64364451ff1..fbf5fb3a264 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -2,7 +2,6 @@
/* RGB Underglow */
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index db3f2bbacc1..48a373b596e 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "A15"
},
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index 5fdab01ef43..141bb477177 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,9 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 7de3ef0b0d2..5b415fbd2bb 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,9 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index b9ebd6d7df1..f54f0d56d25 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,9 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index 89c2c800c6e..e6372961d8f 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,9 @@
"pid": "0x3536",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index b166df22a04..68270606cc4 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,9 @@
"pid": "0x3537",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
deleted file mode 100644
index 1da1cb9590a..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
index 2b542a15da2..245310fd3c5 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -7,6 +7,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 567057cf084..955060de7a0 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,9 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
deleted file mode 100644
index 9a4e39dad21..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
index 8f14c5049e8..3dd74aa3f63 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,9 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index 0c3bee7dcb4..584db341d69 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -5,4 +5,3 @@
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGBLED_NUM 6 // Used when chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index 379ca33af6b..99e1739d206 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -11,6 +11,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"split_count": [3, 3]
},
"ws2812": {
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index ab6beb807f0..543ef8e6c5a 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -33,8 +33,6 @@ along with this program. If not, see .
/* Enables This makes it easier for fast typists to use dual-function keys */
#define PERMISSIVE_HOLD
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
index 5f0b4f85a28..2ae20d2f4a8 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index de14f38f4ee..f7a41abb5c6 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -18,10 +18,7 @@ along with this program. If not, see .
#define EE_HANDS
/* ws2812 RGB LED */
-#if !defined(RGBLED_NUM)
-# define RGBLED_NUM 30
# define RGBLIGHT_LAYERS
-#endif
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index fe66b4f2a6d..c861e7bd10f 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 30,
"sleep": true,
"led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
"split_count": [16, 14]
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index cb17dbbc0bd..122b3f59b0a 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index 5b3e000fba3..246171e696f 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 5d5233ca999..59c7bb3bc03 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -9,7 +9,6 @@
#define NO_ACTION_ONESHOT
#define TAPPING_TOGGLE 3
-#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 1
#define RGBLIGHT_SAT_STEP 1
#define RGBLIGHT_VAL_STEP 1
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index efebe52d0bc..4da2086cb08 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,9 @@
"pid": "0x1000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index a946442dc05..016c501a36f 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,8 +2,6 @@
#pragma once
-#define RGBLED_NUM 9 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index 4000b543c31..4e1f7556803 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -17,6 +17,9 @@
"backlight": {
"breathing_period": 2
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index b6d0049fe29..507b22b5196 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_PWM_TARGET_PERIOD 800000
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
index d371032abfe..2c99da43110 100644
--- a/keyboards/handwired/macroboard/info.json
+++ b/keyboards/handwired/macroboard/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 24,
"sleep": true,
"led_map": [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1]
},
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 0af9f5297dd..1e80b3a9083 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -18,7 +18,6 @@
#define LAYER_STATE_8BIT
- #define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index abfc8a2ba53..27403cb5ead 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index 40f181c988c..091c2f8c069 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
index e27cf292b52..2410865a21a 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -12,6 +12,7 @@
"pin": "D0"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 128,
"sleep": true
},
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index a660e0ddfa1..691995b3498 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index cb4a939a02d..edea65842cd 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -8,6 +8,9 @@
"pid": "0x6579",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
index bb71df9c64f..5f652834a5c 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
index 08c6e107ddf..5b9b821d4df 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 13
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index bb71df9c64f..5f652834a5c 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json
index 69c3ae8bfe4..d58fb2c5f3d 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/info.json
@@ -3,6 +3,9 @@
"cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6"]
},
+ "rgblight": {
+ "led_count": 13
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index b78ca3c807e..7fba95f9d13 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -8,6 +8,9 @@
"pid": "0x0C60",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h
deleted file mode 100644
index a64c4ebeecb..00000000000
--- a/keyboards/handwired/qc60/proto/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 1 // Number of LEDs
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index 7ee210aa846..31c0cc59f75 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -16,7 +16,5 @@
#pragma once
-#define RGBLED_NUM 50
-
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index 24cb90487c4..b99e41bda58 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 50
+ },
"ws2812": {
"pin": "A3"
},
diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h
index c656f968153..ef6699d079c 100644
--- a/keyboards/handwired/splittest/config.h
+++ b/keyboards/handwired/splittest/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
/*
* Feature disable options
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index b301ffeaaf3..cb9c16e889c 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"layouts": {
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index ffd061fa17e..28d368dab8f 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -36,7 +36,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index b76753f19f4..08a6cd06ceb 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -17,6 +17,9 @@
"pin": "B8",
"breathing": true
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "A7",
"driver": "spi"
diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h
index 4fe6fb4428e..fa4c9291e74 100644
--- a/keyboards/handwired/swiftrax/bumblebee/config.h
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* RGB Indicators */
-#define RGBLED_NUM 3
-
/* Solenid Pin */
#define SOLENOID_PIN D2
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
index 9a46cb98495..e2cad64ad8b 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -8,6 +8,9 @@
"pid": "0xE881",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
index 4bff062d6ce..b0fe39ae460 100644
--- a/keyboards/handwired/swiftrax/glacier/config.h
+++ b/keyboards/handwired/swiftrax/glacier/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
/* RGB */
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
index 3aed06628fa..8898503eb71 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -8,6 +8,9 @@
"pid": "0xE890",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
index 5fdda201e0c..daf96d9c9da 100644
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ b/keyboards/handwired/swiftrax/walter/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index a52a0470e70..e7e72a5707b 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -8,6 +8,9 @@
"pid": "0xE964",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index c92944a48fa..c7c89484e2b 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json
index 54d58d8b7f2..b533a8a5cff 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index bb158955e28..b06381d918e 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGBW
- #define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index a48d64f730c..f506b7996a7 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -8,6 +8,9 @@
"pid": "0x1313",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index c2401d394fe..af4b3c0ac0e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 20
-
#define AUDIO_PIN C6
#define EE_HANDS
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
index 3ea61f0a1a4..92e0baace1f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -17,6 +17,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 80,
"split_count": [10, 10]
},
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index a5ab8a89c70..3a7f97f8d2f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -29,8 +29,6 @@ along with this program. If not, see .
// #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define RGBLED_NUM 20
-
#define DEBUG_LED_PIN C13
/* Audio config */
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
index 7e9f90fb1f0..62fa261ac72 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -6,6 +6,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 20,
"split_count": [10, 10]
},
"ws2812": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index b8b8223cde3..2ad18267ad5 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -31,9 +31,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_PWM_TARGET_PERIOD 800000
-
-#define RGBLED_NUM 57
-
#define DEBUG_LED_PIN C13
/* Audio config */
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
index ca4f930cbf5..dff5fec4a54 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -6,6 +6,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 57,
"split_count": [26, 31]
},
"ws2812": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 3440f85a19e..769a348e652 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
#pragma once
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 20
#define RGBLIGHT_LIMIT_VAL 80
#define DEBUG_LED_PIN D6
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index 725c519c0ec..a131ac085bd 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -17,6 +17,7 @@
"pin": "E7"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 80,
"split_count": [10, 10]
},
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index cb92eff0614..df417163abc 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 1
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index 91fe9e1cf44..64abd90db23 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B2"
},
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index 838776b5eb4..b9449c4714b 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -22,10 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* Underlight configuration
- */
-#define RGBLED_NUM 4 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index 8f56d909474..2e2fc6c81f6 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/info.json
@@ -21,6 +21,9 @@
"num_lock": "D5",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index e0c594099a2..1eb108f09c9 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define MASTER_RIGHT
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 1
# define RGBLIGHT_VAL_STEP 1
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index e1966467597..577c2f427c0 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index de1208a7eca..2a7f301a6a9 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -25,8 +25,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index 162faca32cb..171ae7bb027 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index bf9b590421f..f4c4fda7cf6 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -18,5 +18,4 @@
#pragma once
//RGB Stuff
-#define RGBLED_NUM 39
#define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 7c46269579a..89515a8fefb 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 39
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index dd7ef6a5a91..a1fcd50f892 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -35,7 +35,6 @@
#define PERMISSIVE_HOLD
// RGB Stuff
-#define RGBLED_NUM 39
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index 5ba12dc8464..47d586abb01 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 39
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index cf4e9f4ffea..d6b90dfdd65 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -48,8 +48,6 @@ along with this program. If not, see .
#define AUDIO_PIN B5
#endif
-//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
-
// Helix keyboard RGB LED support
// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
#ifdef RGBLED_BACK
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index f31a2e71331..673e9f1ed8d 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -46,10 +46,8 @@ along with this program. If not, see .
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
-#define RGBLED_NUM 50 // Number of LEDs
-
#ifdef RGB_MATRIX_ENABLE
- #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+ #define RGB_MATRIX_LED_COUNT 50
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index ed2c1544b85..25a0a5a0416 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -23,6 +23,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 50,
"max_brightness": 120,
"split_count": [25, 25]
},
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index ef5fefaaede..c1def15db6f 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -46,10 +46,8 @@ along with this program. If not, see .
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
-#define RGBLED_NUM 64 // Number of LEDs
-
#ifdef RGB_MATRIX_ENABLE
- #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+ #define RGB_MATRIX_LED_COUNT 64
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index bdb5bfaf6b2..d659a879a63 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -23,6 +23,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 120,
"split_count": [32, 32]
},
diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
index ae0e277e8d4..b544871c2ee 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -18,7 +18,6 @@
#pragma once
-#define RGBLED_NUM 38
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
index 1f95aabdb5b..5d313e7186e 100644
--- a/keyboards/hidtech/bastyl/info.json
+++ b/keyboards/hidtech/bastyl/info.json
@@ -20,6 +20,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 38,
"split": true
},
"processor": "atmega32u4",
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
index bcf040c6cb1..89a9909d844 100644
--- a/keyboards/hifumi/config.h
+++ b/keyboards/hifumi/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
/* ws2812 RGB LED */
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json
index a4aeccf83ad..76daee50b77 100644
--- a/keyboards/hifumi/info.json
+++ b/keyboards/hifumi/info.json
@@ -13,6 +13,9 @@
"rows": ["D4", "C6"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index ef5a221da55..bb2d589ca72 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 7
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
index 522cc1d4094..2f83d1a9e91 100644
--- a/keyboards/hineybush/h08_ocelot/info.json
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -17,6 +17,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 7,
"max_brightness": 220,
"sleep": true
},
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index 64b6cc253f5..760ec3d55e3 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json
index 3c052c57195..55b033d52c4 100644
--- a/keyboards/hineybush/h60/info.json
+++ b/keyboards/hineybush/h60/info.json
@@ -18,6 +18,7 @@
"levels": 12
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index ef9fe121f72..bb2d589ca72 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
index 9e98e38b363..9da61879cd2 100644
--- a/keyboards/hineybush/h65/info.json
+++ b/keyboards/hineybush/h65/info.json
@@ -21,6 +21,7 @@
"caps_lock": "E6"
},
"rgblight": {
+ "led_count": 17,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index ef9fe121f72..bb2d589ca72 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
index 9d2204e87a0..06c0b100c59 100644
--- a/keyboards/hineybush/h65_hotswap/info.json
+++ b/keyboards/hineybush/h65_hotswap/info.json
@@ -21,6 +21,7 @@
"caps_lock": "E6"
},
"rgblight": {
+ "led_count": 17,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index 6aca6c59c06..8ba37d9c448 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json
index d1e183952b3..4c0c7e6dae8 100644
--- a/keyboards/hineybush/h660s/info.json
+++ b/keyboards/hineybush/h660s/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index 2de701b1356..a946cd2455f 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json
index b89f9765e61..b265a1fba3b 100644
--- a/keyboards/hineybush/h75_singa/info.json
+++ b/keyboards/hineybush/h75_singa/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 411f54b2af5..f86bfa3a181 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json
index be5aa7beede..79472970c5e 100644
--- a/keyboards/hineybush/h87a/info.json
+++ b/keyboards/hineybush/h87a/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index 86265ea2fa5..0b402c7b9e7 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json
index 454ee145fa1..286b11e8142 100644
--- a/keyboards/hineybush/h88/info.json
+++ b/keyboards/hineybush/h88/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index 57b88bb6343..829f52f2817 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
//EITHERWAY is supported through a custom matrix
//#define DIODE_DIRECTION EITHERWAY
- #define RGBLED_NUM 27
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
index c8a227e7020..9c9d71bc789 100644
--- a/keyboards/hineybush/hbcp/info.json
+++ b/keyboards/hineybush/hbcp/info.json
@@ -16,6 +16,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 27,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index 27f5bd881a7..a946cd2455f 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 26
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index a6f413060b4..dc981df604c 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 26,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index 708fff74962..ff72b6082aa 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json
index 5780fbec14c..81b0a916878 100644
--- a/keyboards/hineybush/sm68/info.json
+++ b/keyboards/hineybush/sm68/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 3589952afbd..9f9d81bea91 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json
index 0c002b22c4d..98f8f721f30 100644
--- a/keyboards/hnahkb/stella/info.json
+++ b/keyboards/hnahkb/stella/info.json
@@ -22,6 +22,9 @@
"scroll_lock": "B7",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 14,
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 544b801375a..d07d6874471 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json
index 31e05f6a221..f1dd008b98f 100644
--- a/keyboards/hnahkb/vn66/info.json
+++ b/keyboards/hnahkb/vn66/info.json
@@ -28,6 +28,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index de5824e2223..0e58118e057 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -17,9 +17,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
- /* RGB Lighting config */
- #define RGBLED_NUM 24
-
/* RGB Lighting effect */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 2ceb38706f2..9de9b1decc2 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -21,6 +21,9 @@
"indicators": {
"caps_lock": "C7"
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index 90374871735..6867922fd37 100644
--- a/keyboards/horrortroll/lemon40/config.h
+++ b/keyboards/horrortroll/lemon40/config.h
@@ -18,10 +18,6 @@
/* RGB light config */
#ifdef RGBLIGHT_ENABLE
-
- /* RGB light pin */
- #define RGBLED_NUM 15
-
/* RGB light effect */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index f4b4c383c9a..29530b37570 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
index bee8a0322f2..409b36d2b17 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
index 82966d1254d..fcb7afa6020 100644
--- a/keyboards/hp69/info.json
+++ b/keyboards/hp69/info.json
@@ -18,6 +18,7 @@
"scroll_lock": "A7"
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h
index 520a21cdce3..124f41c5b87 100755
--- a/keyboards/hub16/config.h
+++ b/keyboards/hub16/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json
index 3b4d14bc100..9883cd3302a 100644
--- a/keyboards/hub16/info.json
+++ b/keyboards/hub16/info.json
@@ -15,6 +15,7 @@
]
},
"rgblight": {
+ "led_count": 11,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index 5fc99ecbf50..60a2cca24b3 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -18,10 +18,7 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 27
-
#define RGB_MATRIX_LED_COUNT 27
- #define RGBLED_NUM 27
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index 994b9405d9b..79a545edd6c 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -22,6 +22,9 @@
{"pin_a": "A8", "pin_b": "A9"}
]
},
+ "rgblight": {
+ "led_count": 27
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h
index d28c76103cd..59787e7920d 100644
--- a/keyboards/hubble/config.h
+++ b/keyboards/hubble/config.h
@@ -5,7 +5,6 @@
/* rgb */
-#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json
index 30a07248068..953323fe009 100644
--- a/keyboards/hubble/info.json
+++ b/keyboards/hubble/info.json
@@ -15,6 +15,7 @@
"velocikey": true
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ibm/model_m/mschwingen/config.h b/keyboards/ibm/model_m/mschwingen/config.h
index b1dc81b8c78..b34d29649ad 100644
--- a/keyboards/ibm/model_m/mschwingen/config.h
+++ b/keyboards/ibm/model_m/mschwingen/config.h
@@ -69,9 +69,6 @@
# error one of MODELM_LEDS_FFC, MODELM_LEDS_WIRED or MODELM_LEDS_WS2812 must be set!
#endif
-// 3* WS2812 LEDs instead of singlecolor GPIO LEDs
-#define RGBLED_NUM 3
-
// disabled, needs PCB patch.
//#define AUDIO_PIN C6
//#define NO_MUSIC_MODE
diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index 1ba525de6c8..ce740e4a548 100644
--- a/keyboards/ibm/model_m/mschwingen/info.json
+++ b/keyboards/ibm/model_m/mschwingen/info.json
@@ -8,6 +8,9 @@
"pid": "0x558E",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index dc525a111d5..5132abe0958 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index 2b18d0417ec..e2d965d3e83 100644
--- a/keyboards/ibnuda/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
@@ -8,6 +8,9 @@
"pid": "0x6974",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 2174e39bd22..0dfb2940915 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json
index 1407d02c802..62c85df4e33 100644
--- a/keyboards/idobao/id75/v1/info.json
+++ b/keyboards/idobao/id75/v1/info.json
@@ -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"
},
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index 122b4e836da..cbcaa79d47f 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index c941a21d414..57be2fa60a5 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -19,6 +19,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 9b7459de6cb..a1d8aff05d5 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index 1deaf6b270d..fe1e4030a20 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -19,6 +19,9 @@
"indicators": {
"caps_lock": "C7"
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index a857f49125a..984b1e14be5 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -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
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index f49337fc149..7b89ba79d15 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -18,6 +18,9 @@
"levels": 7,
"breathing": true
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 87ed689f667..f49956a4cef 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -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
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index 666ffbdf89d..37cf492bfc5 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index 1eff584a832..601bdd2eaf6 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -31,7 +31,6 @@
//rgb light setting
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 8d4621a6084..aa2f32c0392 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -15,6 +15,7 @@
"driver": "IS31FL3731"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index 92c9bedfc96..99fdb66e473 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -31,7 +31,6 @@
//rgb light setting
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index 9839aa10deb..54c90f5065e 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -15,6 +15,7 @@
"driver": "IS31FL3731"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 8407f4c9f75..5446d4fd299 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 23
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json
index 000a3436470..6dcefe4a2a8 100644
--- a/keyboards/irene/info.json
+++ b/keyboards/irene/info.json
@@ -8,6 +8,9 @@
"pid": "0x3000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "F1"
},
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 173780248b4..05db962ced2 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -20,7 +20,6 @@
#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
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index 1e8c7cb7d37..3c5719b995d 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index d500952303a..977df4e77ee 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 95a05b8f34d..60f9abf112d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index 4a8ad8b69fa..93031bede7d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 95a05b8f34d..60f9abf112d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index 0b112288c18..b95371ebf19 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -13,6 +13,7 @@
"rows": ["B0", "B1", "B2", "B3", "B7"]
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 6abe1d446de..0978a1717b3 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index 0c6413d5876..eb89bcbc44b 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index 35107f15183..2313045caae 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index 1c56cc00ee8..991c8f9c7e8 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index cec546538a8..0176a7c7236 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 1e11f466a07..db081dfa56e 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 1730c19fdb1..491c0f4304b 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -17,7 +17,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 135b075243f..57845fa1a2b 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -20,6 +20,7 @@
"pin": "B6"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 225,
"sleep": true
},
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 64941df5bc6..af8d6aa9adb 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGBLIGHT_TIMER
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index f5e01788daa..1f250130fcb 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -14,6 +14,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 7,
"sleep": true,
"split": true
},
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index c865aa96068..8f8ff123db6 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -73,7 +73,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGBLIGHT_TIMER
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -85,21 +84,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#ifndef IOS_DEVICE_ENABLE
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 255
-#else
-#define RGBLIGHT_LIMIT_VAL 130
-#endif
-#define RGBLIGHT_VAL_STEP 8
-#else
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 90
-#else
-#define RGBLIGHT_LIMIT_VAL 45
-#endif
-#define RGBLIGHT_VAL_STEP 4
-#endif
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index 9f44936e0a2..911a50704eb 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -13,6 +13,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 7,
"sleep": true,
"split": true
},
diff --git a/keyboards/jian/rev1/post_config.h b/keyboards/jian/rev1/post_config.h
new file mode 100644
index 00000000000..fade065e192
--- /dev/null
+++ b/keyboards/jian/rev1/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 255
+# else
+# define RGBLIGHT_LIMIT_VAL 130
+# endif
+# define RGBLIGHT_VAL_STEP 8
+#else
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 90
+# else
+# define RGBLIGHT_LIMIT_VAL 45
+# endif
+# define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index ee7fb987751..81d8212ab60 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGBLIGHT_TIMER
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,21 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#ifndef IOS_DEVICE_ENABLE
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 255
-#else
-#define RGBLIGHT_LIMIT_VAL 130
-#endif
-#define RGBLIGHT_VAL_STEP 8
-#else
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 90
-#else
-#define RGBLIGHT_LIMIT_VAL 45
-#endif
-#define RGBLIGHT_VAL_STEP 4
-#endif
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 2930b4d71fb..77fb0778040 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -13,6 +13,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 7,
"sleep": true,
"split": true
},
diff --git a/keyboards/jian/rev2/post_config.h b/keyboards/jian/rev2/post_config.h
new file mode 100644
index 00000000000..fade065e192
--- /dev/null
+++ b/keyboards/jian/rev2/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 255
+# else
+# define RGBLIGHT_LIMIT_VAL 130
+# endif
+# define RGBLIGHT_VAL_STEP 8
+#else
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 90
+# else
+# define RGBLIGHT_LIMIT_VAL 45
+# endif
+# define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
index 1c4eb6fae0e..a6d252e56a1 100644
--- a/keyboards/jiran/rev2/config.h
+++ b/keyboards/jiran/rev2/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 56
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
index 9ee15f7af11..bade70f2746 100644
--- a/keyboards/jiran/rev2/info.json
+++ b/keyboards/jiran/rev2/info.json
@@ -1,5 +1,6 @@
{
"rgblight": {
+ "led_count": 56,
"split_count": [28, 28]
},
"ws2812": {
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
index 1b66b1bb25d..764748f3da9 100644
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index 9624933b8db..3586c8ed193 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -8,6 +8,9 @@
"pid": "0x2020",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index 1b66b1bb25d..764748f3da9 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index 6886f8f24b1..2108bad6d2f 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -8,6 +8,9 @@
"pid": "0x2322",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index a80552a780d..7af0bca08e7 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -24,8 +24,6 @@
/* RGB Definitions */
-
-#define RGBLED_NUM 84
#define RGBLIGHT_MAX_LAYERS 32
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 6f1388f49e4..f259d26a657 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -16,6 +16,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 84,
"max_brightness": 200
},
"diode_direction": "COL2ROW",
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index b91df2c35e4..4589e42ad25 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -48,7 +48,6 @@ along with this program. If not, see .
#define AUDIO_CLICKY
#endif
- #define RGBLED_NUM 6 // Left(4) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index 6b4dbb0884c..c01e6a4673d 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -14,6 +14,9 @@
{"pin_a": "B3", "pin_b": "B2"}
]
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index e343cb1ae47..b8e85c88a1c 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -48,7 +48,6 @@ along with this program. If not, see .
#define AUDIO_CLICKY
#endif
- #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index fa5e1bf3852..7847aec9c2c 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -15,6 +15,7 @@
]
},
"rgblight": {
+ "led_count": 14,
"led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11]
},
"ws2812": {
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 3017ca2ab0a..6d72d8e7b66 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#endif
/* RGBLIGHT */
- #define RGBLED_NUM 4 // Left(2) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index cd0286ef6bf..2a093d2496b 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -12,6 +12,9 @@
"cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
"rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "F1"
},
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h
index 4a41d3e358e..623aaf149cc 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -2,8 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#define RGBLED_NUM 56
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index f0a1817e8b7..1b1f156fa50 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 56,
"split_count": [28, 28]
},
"ws2812": {
diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index 57f829e692b..4477b6ff96a 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 8ec6b527054..688b69f2414 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -8,6 +8,9 @@
"pid": "0x3738",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 655a8af4a95..fdfa96bcdce 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index 95781f0581f..261a35d54e1 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -8,6 +8,9 @@
"pid": "0x3938",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index c8ae65099ba..5722578ace7 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index cbe83c98eed..98fe9c207db 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.2",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 9b42731f845..d81b6695f06 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 40
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index 790db40f6dd..6e1ab85cbb7 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 40
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index cafa5575bb5..7d3afe6307d 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index 0aaeb704ace..545deac3961 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -20,6 +20,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 9
"split": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index bd892c58804..ac02512955f 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 17
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
index f93d1b2662c..5febedda8fe 100644
--- a/keyboards/kakunpc/angel17/rev1/info.json
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -4,6 +4,7 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"rgblight": {
+ "led_count": 17,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index b836e25a641..7e5dc03350a 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
- #define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
index 6d6f046d006..25b9539cbd7 100644
--- a/keyboards/kakunpc/angel64/alpha/info.json
+++ b/keyboards/kakunpc/angel64/alpha/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 25,
"sleep": true
},
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index b836e25a641..7e5dc03350a 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
- #define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
index e8c78ba5bfe..3cd7d7370f0 100644
--- a/keyboards/kakunpc/angel64/rev1/info.json
+++ b/keyboards/kakunpc/angel64/rev1/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 25,
"sleep": true
},
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 5e826946f24..ac02512955f 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 40093e29fd5..2eff1f24952 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 5e826946f24..ac02512955f 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index abbf9570aaf..6b546838f3d 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index 608a9fcd57a..d35f69a2590 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 69
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index 196960dc2cc..89dbe229d48 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 69,
"max_brightness": 200,
"sleep": true,
"split_count": [32, 37]
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index 97626d42be9..b1bfa4615e9 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index 863f97d64d5..5542be81fc8 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 97626d42be9..b1bfa4615e9 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index 80b3314c596..cd1e8d6ce9d 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index 8a0039c78f3..4973eb95ec4 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D2
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
index 0bce7ffe2fb..02b6fdbe388 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -1,5 +1,6 @@
{
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index e895be8715a..b64bfc38739 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D2
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
index 94dc890dc78..c0c99f66431 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -1,5 +1,6 @@
{
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index 76f9e8c1293..559e1f6abad 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
- #define RGBLED_NUM 111
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
index 3901475b861..39af07e72c1 100644
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ b/keyboards/kakunpc/thedogkeyboard/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 111,
"max_brightness": 50,
"sleep": true
},
diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
index 386e4b0a0c3..4143779eecd 100644
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ b/keyboards/kapcave/paladinpad/rev1/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json
index 0fec9260a90..938098c26a9 100644
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h
index 239a873384e..e863e116b66 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json
index 699cdde82d0..43eb12d79c2 100644
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index f580f94c9a2..e63f8b86029 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -5,8 +5,6 @@
/* Select hand configuration */
#define MASTER_LEFT
-#define RGBLED_NUM 88
-
#define RGB_MATRIX_LED_COUNT 88
#define RGB_MATRIX_SPLIT { 44, 44 }
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index cab51ec837d..d94c146765a 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -15,6 +15,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 88,
"max_brightness": 120,
"split_count": [44, 44]
},
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 04cd6315a73..bd7c9a6f7c5 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB backlight */
-# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
index 85be2a4a7c6..1713de919c1 100644
--- a/keyboards/kb_elmo/isolation/info.json
+++ b/keyboards/kb_elmo/isolation/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index f7423db582e..387d189b26c 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -28,5 +28,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 7
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_BGR // RGB on the Noah is different order
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index e0b788a8760..029b24cd632 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index ee3574ac9cd..c495f442663 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -19,8 +19,7 @@
#define USB_SUSPEND_WAKEUP_DELAY 5000
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define RGBLED_NUM 66
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 66
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index 5f8faf89ae0..32a661a70b4 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -7,6 +7,9 @@
"pid": "0x0106",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 66
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 5e43b120d08..10dc5f97b84 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 )
#define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index 402593379d9..70906f7b717 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -17,6 +17,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 5e43b120d08..10dc5f97b84 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 )
#define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index 958a031a39c..86b98e5fa1c 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -18,6 +18,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 9b4a354800e..698e6a23d92 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 88fe409e30f..0f7b7476d8d 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index 2ce93360c2a..56a528dce34 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index 67561d3d093..3a905f2e471 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index 2092332c0b6..b311b402618 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json
index 796253aa23f..cf37d516e86 100644
--- a/keyboards/kbdfans/kbd67/hotswap/info.json
+++ b/keyboards/kbdfans/kbd67/hotswap/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 8b79d929d66..317453e45ad 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -18,8 +18,7 @@
#define USB_SUSPEND_WAKEUP_DELAY 5000
-#define RGBLED_NUM 68
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index f7d5ab552f0..a2e2618c814 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -4,6 +4,9 @@
"pid": "0x1227",
"device_version": "0.0.4"
},
+ "rgblight": {
+ "led_count": 68
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index ec2e9d42738..930c7e7faa2 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index ee09db26346..728c8205b15 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 190ef273f9a..3138184150a 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index 6eaf1d3871e..a7b280b40f7 100644
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -24,6 +24,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 3ef91c5d5c0..8090b623914 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index d876c2cd166..25bbdc2a24b 100644
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 2d6af51f652..89ab02d3268 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -19,7 +19,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
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index 8e486dcfc13..53c4206c3ad 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -22,6 +22,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index b3358cac295..34daaaed4db 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -22,6 +22,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index f039fa94cd4..00213f746c8 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -28,7 +28,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
#define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index 67cb64afe54..86aa4090399 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -17,6 +17,7 @@
"caps_lock": "C6"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index 6d1273875d7..08555f63d1c 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -19,8 +19,7 @@
#define USB_SUSPEND_WAKEUP_DELAY 5000
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define RGBLED_NUM 84
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 84
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 231f13f4122..e5b6f980d38 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -8,6 +8,9 @@
"pid": "0x6063",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 84
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index d10c5657184..d55b72c6d4e 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index 39da3c9521e..2f173aca359 100644
--- a/keyboards/kbdfans/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
@@ -23,6 +23,7 @@
"scroll_lock": "B2"
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index 010745066ab..6d907961df4 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json
index 07d45a948f4..6d817949479 100644
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -21,6 +21,7 @@
"pin": "B3"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index a3a9a993df2..d849732a072 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -27,4 +27,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index 3527370e4c0..4495eab886d 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -17,6 +17,9 @@
"pin": "D4",
"breathing": true
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index a23a8173eb3..6d907961df4 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 0d3d551d278..aa4a3c5e1f4 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index fb154031a05..9fa20a136cf 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
index 4ba2f385163..af3b136f8fb 100644
--- a/keyboards/kbdfans/niu_mini/info.json
+++ b/keyboards/kbdfans/niu_mini/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 4
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 54794e66be1..9cc883891ad 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 104
#define RGB_MATRIX_LED_COUNT 104
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index d79d0e01135..0236ebcefe1 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index e5b2234a6c8..559a21b6b46 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -22,6 +22,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 4,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index aa11063f71b..d67ae880ed3 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index b3047ac96f5..97d1bdc57a6 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -22,6 +22,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 4,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index d693cbe66a8..4cbb32a859d 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -32,7 +32,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
#define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json
index bca4d3bfd8d..470608d2230 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -19,6 +19,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h
index 5298868bcf1..6089b4d0844 100644
--- a/keyboards/kbnordic/nordic60/rev_a/config.h
+++ b/keyboards/kbnordic/nordic60/rev_a/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define RGBLED_NUM 16
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json
index 126de687b8b..26053d476c2 100644
--- a/keyboards/kbnordic/nordic60/rev_a/info.json
+++ b/keyboards/kbnordic/nordic60/rev_a/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index 640584ee65f..a3051f0d5fa 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json
index 2bbe66429f5..1b463caa169 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h
index f2fd71a8d09..63593438837 100644
--- a/keyboards/keebformom/config.h
+++ b/keyboards/keebformom/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 40
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json
index ffc134d5d2e..fc0910a5a73 100644
--- a/keyboards/keebformom/info.json
+++ b/keyboards/keebformom/info.json
@@ -12,6 +12,7 @@
"pin": "F4"
},
"rgblight": {
+ "led_count": 40,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index dd26a53277f..0aeaffa895e 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -11,7 +11,6 @@
#define ENCODERS_CW_KEY { { 1, 1 }, { 3, 1 } }
#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index ab0bd9c89b6..9c9cd011e8b 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 33bd6e8269c..b14a5ee212b 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,7 +3,6 @@
#pragma once
-# define RGBLED_NUM 32
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -61,7 +60,7 @@
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 32
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 35150c58d16..4de5a920ab6 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -15,6 +15,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 32,
"max_brightness": 120,
"sleep": true
},
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index fb50494fd5f..184cdf08d52 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json
index fd9800b8382..4d49e0c3248 100644
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@@ -16,6 +16,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 671374e652a..6d001e65321 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
-# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -35,7 +34,7 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_TWINKLE
// RGB Matrix
# ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 11
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index 3b0b2b29a18..c65e1664066 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -5,6 +5,7 @@
"device_version": "2.0.0"
},
"rgblight": {
+ "led_count": 11,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index ecc01620e64..0b8941e7760 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -23,9 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 20 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 39b8cd7e2ce..5738ac69530 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 20,
"split_count": [10, 10]
},
"ws2812": {
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 14c93278a61..401de718c15 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -19,4 +19,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#define RGBLED_NUM 4
diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index 44d846da74a..d671417c922 100644
--- a/keyboards/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -17,6 +17,9 @@
"pin": "B5",
"levels": 6
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index b2727f1ab24..401de718c15 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -19,5 +19,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-
-#define RGBLED_NUM 10
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index 29322a80443..015a8986d72 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B5"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index b148616d427..633b5341da9 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
- #define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index 1d0949e1f97..0aa071b9514 100644
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -23,6 +23,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index f8dbfdf602a..6b9dcfd57e8 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index a4a71275b91..8c5bfab673d 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index 917475fab75..f162dd2f10d 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -34,5 +34,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index 467aaaa4b64..c680785933d 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -25,6 +25,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 16,
"led_map": [0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index 59ea066451c..44286c7817d 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14 // Number of LEDs
/*
* Feature disable options
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index 7d12c8c60bd..9f2147ca24d 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -23,6 +23,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 14,
"split_count": [7, 7]
},
"ws2812": {
diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 7fd5c0ff951..ec1e07d8fbe 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index af3c7acd426..a389e7ae092 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 7fd5c0ff951..ec1e07d8fbe 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index bc19a0cc8be..0be141b00f2 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 7fd5c0ff951..ec1e07d8fbe 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 2eef2853d87..f9c025f9ce2 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 2bc112261ad..9c0c7e07c75 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 4d427f75278..8c188a96202 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -19,6 +19,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 2a278b2fb28..e5b7a7633eb 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index d0aa0d12c99..4ba2f6e193e 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -19,6 +19,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 78e747168d2..7bfc3e8ff8f 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define BACKLIGHT_DEFAULT_LEVEL 3
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index ec8b01893a8..30e5c6f9990 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -19,6 +19,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index a79c4cf7888..359cb509efe 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D5
/* ws2812 RGB LED */
-# define RGBLED_NUM 68
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -78,7 +77,7 @@ along with this program. If not, see .
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 68
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 58c96976ede..59617c4cbae 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -21,6 +21,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 120,
"sleep": true,
"split_count": [34, 34]
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 236028158ed..511fb22a07f 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D5
/* ws2812 RGB LED */
-# define RGBLED_NUM 68
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -78,7 +77,7 @@ along with this program. If not, see .
//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 68
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index beb479f01b2..738fe857eb9 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -22,6 +22,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 120,
"sleep": true,
"split_count": [34, 34]
diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index d8a0161dbaa..0771ad9e251 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@@ -38,4 +38,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16 // Number of LEDs
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index 78bbb01357e..fd93ad86d50 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -22,6 +22,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h
index 93ef4c9130c..7328c4731a9 100644
--- a/keyboards/keebio/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -28,6 +28,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index 1899e882369..5fd29b1fbef 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,9 @@
"pid": "0x1147",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h
index b6d4d647192..2fd8b7d4d04 100644
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -23,6 +23,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
index f947546b3d5..0a98e032d46 100644
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@@ -17,6 +17,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h
index b6d4d647192..2fd8b7d4d04 100644
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -23,6 +23,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
index ea62141edd2..962f555e128 100644
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@@ -17,6 +17,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h
index 3521356e7d0..e1c73cd56ee 100644
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@@ -25,6 +25,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
index 81230247b68..cac1c3ac351 100644
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@@ -23,6 +23,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index e4878b790a6..6fdc15c582d 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
index b75a6787976..cd729aa87b7 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -13,6 +13,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index e4878b790a6..6fdc15c582d 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
index 4a802ad4549..f6b80cb9460 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -14,6 +14,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 8d3be7827d9..7e1e36bda39 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
/*
* Feature disable options
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
index 9eb4c51323f..9012b3ab222 100644
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index f439fd05af7..ee52660c6ce 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16 // Number of LEDs
// Set 65% column (option 1) and Macro (option 2) on by default
#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x60
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index cf44ce3b819..ba82cdcb2f4 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 16,
"split_count": [8, 8]
},
"ws2812": {
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index 29c55072ea5..65b8ea7f8c8 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define CAPS_LOCK_LED_PIN B6
/* ws2812 RGB LED */
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index d1871c887bd..c076a697f52 100644
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -22,6 +22,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index 29c55072ea5..65b8ea7f8c8 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define CAPS_LOCK_LED_PIN B6
/* ws2812 RGB LED */
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index 93dd6774b57..66deb759511 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -22,6 +22,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index 84e9d85dd46..abb3b8b340a 100644
--- a/keyboards/keebio/quefrency/rev4/config.h
+++ b/keyboards/keebio/quefrency/rev4/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index 53b30b5d704..8ca39b9145b 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
index 84e9d85dd46..abb3b8b340a 100644
--- a/keyboards/keebio/quefrency/rev5/config.h
+++ b/keyboards/keebio/quefrency/rev5/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 15aeef9426b..f922b8cb947 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8]
},
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 979899d5472..f683a1c360a 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index a0b1188a7c9..23666a557b4 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -17,6 +17,9 @@
"pin": "B5",
"levels": 5
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index a80bbe7495e..1308487070c 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* WS2812 RGB LED */
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -34,7 +33,7 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_TWINKLE
// RGB Matrix
# ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 12
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index 7466a46e8cc..0c517b58981 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -18,6 +18,7 @@
]
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index 54d3f668a73..9d0eff7a353 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json
index 3c4951b407e..6a013bc3bb3 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -8,6 +8,9 @@
"pid": "0x1112",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index 204afe952cf..18b5d426e43 100644
--- a/keyboards/keebio/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/rev1/config.h
@@ -21,6 +21,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 14
diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
index 19dba279840..a003331f25d 100644
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ b/keyboards/keebio/viterbi/rev1/info.json
@@ -8,6 +8,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 14,
"split_count": [7, 7]
},
"ws2812": {
diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h
index 0c858c61647..010fcffc9ba 100644
--- a/keyboards/keebio/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -23,6 +23,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 14
diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
index 0dfbc12a173..88ab2cd1374 100644
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ b/keyboards/keebio/viterbi/rev2/info.json
@@ -17,6 +17,7 @@
"levels": 7
},
"rgblight": {
+ "led_count": 14,
"split_count": [7, 7]
},
"ws2812": {
diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h
index b6d4d647192..2fd8b7d4d04 100644
--- a/keyboards/keebio/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -23,6 +23,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index c40265fc5b4..3b88fcdd771 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -17,6 +17,9 @@
"pin": "B5",
"levels": 7
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index d2aff68bee6..1623483d2a9 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#define AUDIO_PIN C6
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index da393c28437..dee4f903826 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h
index 73dacd28694..2777b11d526 100644
--- a/keyboards/keebmonkey/kbmg68/config.h
+++ b/keyboards/keebmonkey/kbmg68/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 68
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json
index 76f2f98ed2b..fd2becbe50a 100644
--- a/keyboards/keebmonkey/kbmg68/info.json
+++ b/keyboards/keebmonkey/kbmg68/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 68,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index 20493f173c5..9be0f484f23 100644
--- a/keyboards/keebsforall/coarse60/config.h
+++ b/keyboards/keebsforall/coarse60/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index 11ec69872f8..3085eb90b5e 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -23,6 +23,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index a67f02b27c5..5790a58b03f 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define SLIDER_PIN D4
-# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
index d47152dc7bf..ba1937e832e 100644
--- a/keyboards/keebwerk/nano_slider/info.json
+++ b/keyboards/keebwerk/nano_slider/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index 2b008e5ca75..9f8fb290d53 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -27,7 +27,6 @@
#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
diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index f66eefd2da9..35f3aa87b1c 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 15
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index 450380415d4..029aa12c95c 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index 026f431d5c6..f170975f0ad 100644
--- a/keyboards/keybage/radpad/info.json
+++ b/keyboards/keybage/radpad/info.json
@@ -23,6 +23,7 @@
"matrix": [1, 3]
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
index 2ddcf1a143d..8e44b27ace9 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -16,10 +16,6 @@
#pragma once
-#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 60 // Total number of LEDs
-#endif
-
// Limit the power draw
#ifdef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index c9af182427d..e0106f44230 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -22,6 +22,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 60,
"split_count": [30, 30]
},
"ws2812": {
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 47d71ba9113..4fa58a42c99 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -1,6 +1,5 @@
#pragma once
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 4
# define RGBLIGHT_SAT_STEP 4
# define RGBLIGHT_VAL_STEP 4
diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 0766e0a2e48..15be2161d48 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -8,6 +8,9 @@
"pid": "0x0512",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index d2cf17fe2b3..cf2fe9e01b9 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 2d4fa5365b1..cf9e7837a88 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -12,6 +12,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 108
},
"matrix_pins": {
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index ab1fab73ffb..cf2fe9e01b9 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
index 8dccdc233d0..a0e34eba716 100644
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -12,6 +12,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 96
},
"matrix_pins": {
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 0449ce46b0f..7b4910325f5 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 32
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index 1d461251e9c..c1bcfedba23 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 32,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 822b8104e50..1b2f4d983c1 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 32
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 476846b8531..98ee6bca70f 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -11,6 +11,7 @@
"pin": "B6"
},
"rgblight": {
+ "led_count": 32,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 8247293e1dc..33fe6febfc6 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 8c5cf8f1c80..47c131d2fc7 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 414590f6437..27839552395 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -17,7 +17,3 @@
#pragma once
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 69fe9afd776..7e5030ba2ac 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 414590f6437..27839552395 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -17,7 +17,3 @@
#pragma once
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 0af41bab773..cfa07576da0 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 5ab93481266..1455dfdcc4c 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json
index 9755bd65691..a4354cd1f11 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
@@ -8,6 +8,9 @@
"pid": "0x0472",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "C6"
},
diff --git a/keyboards/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h
index 24ee223fce6..1b8d4181e1b 100644
--- a/keyboards/keyquest/enclave/config.h
+++ b/keyboards/keyquest/enclave/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
/* RGB light setup*/
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json
index 9b3e5faf7cf..2258cf5eff6 100644
--- a/keyboards/keyquest/enclave/info.json
+++ b/keyboards/keyquest/enclave/info.json
@@ -11,6 +11,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 2,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h
index 6fea0e2cb61..29c0d69b050 100755
--- a/keyboards/keysofkings/twokey/config.h
+++ b/keyboards/keysofkings/twokey/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 4
#define RGBLIGHT_VAL_STEP 4
diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json
index 8040b94face..cd9c4b9ed1c 100644
--- a/keyboards/keysofkings/twokey/info.json
+++ b/keyboards/keysofkings/twokey/info.json
@@ -8,6 +8,9 @@
"pid": "0xAE12",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index adca3366f23..c0e4a7daaf1 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 884bc706e49..118ce4ed417 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B5", "pin_b": "B4"}
]
},
+ "rgblight": {
+ "led_count": 0
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
deleted file mode 100644
index c6fba5ebcf8..00000000000
--- a/keyboards/kikoslab/ellora65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 Swiftrax
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/*RGB TINGS*/
-#define RGBLED_NUM 12
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 5f3646476bb..0ab7f7015af 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B0", "pin_b": "B1"}
]
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index af9ffae03db..8d024b26a5c 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -18,7 +18,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
-# define RGBLED_NUM 2
# define RGBLIGHT_EFFECT_BREATHING
#endif
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index 0de5b82bddf..c3fb2f83d57 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B2", "pin_b": "B1"}
]
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index b3795f81012..9a86093a721 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B2", "pin_b": "B1"}
]
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index fe391e91a19..60ad9c31a42 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -22,9 +22,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 10 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index c3dfe669104..b5fc1c8474d 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index 0f5a7a6d7fb..9cc6a85e97e 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -6,7 +6,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 0
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 2d715dbe51f..bf865825ffd 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -6,9 +6,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 4 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index a5bb27e3972..b0f88b87ba3 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B3", "pin_b": "B2"}
]
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index 3dba5022386..8d944715925 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -22,8 +22,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json
index ad77ae56085..598598b100c 100644
--- a/keyboards/kingly_keys/ropro/info.json
+++ b/keyboards/kingly_keys/ropro/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B7", "pin_b": "D5"}
]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index cb3fcd2e0da..829fc10db8b 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -21,9 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 4 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index d2f408e51fe..fcb039b7c7e 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 682f1a75315..adce2a42d51 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -30,4 +30,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 3
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index b10260aa0b4..74a51ead57b 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,9 @@
"pid": "0x0003",
"device_version": "0.0.4"
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index b51a90cb7e5..8d1b1dad397 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json
index 48e4bdf85eb..d52e375cbba 100644
--- a/keyboards/kira75/info.json
+++ b/keyboards/kira75/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index e4a2d7f68ab..d5da66cb689 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -5,7 +5,6 @@
#define TAP_CODE_DELAY 10
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 7ecd81e07b1..b5f4af07a9e 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -18,6 +18,9 @@
{"pin_a": "F5", "pin_b": "F6"}
]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "B2"
},
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 6a4a90e77f7..c0aea17206e 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index 7537e7fe8a3..87995d7955f 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -8,6 +8,9 @@
"pid": "0x0303",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 6ff8c526fc6..250c0defd04 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index b41eb189f92..906116e0b23 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index dd6631f5456..363e1d894ae 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 30 // Number of LEDs
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/info.json
index bc79963cb16..61f8c9c2ca7 100644
--- a/keyboards/kona_classic/info.json
+++ b/keyboards/kona_classic/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 30
+ },
"ws2812": {
"pin": "B2"
},
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index 50711479bcb..e08e78d79cd 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json
index 4b37d664dc9..068d849a4df 100644
--- a/keyboards/kopibeng/mnk88/info.json
+++ b/keyboards/kopibeng/mnk88/info.json
@@ -12,6 +12,7 @@
"pin": "A10"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index c3cda1644c8..f64c2ccb8f6 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
index 343e5556208..1a6c74d6a60 100644
--- a/keyboards/kopibeng/xt60/info.json
+++ b/keyboards/kopibeng/xt60/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.2"
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index c3cda1644c8..f64c2ccb8f6 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json
index 52fd82b69a3..615fa769003 100644
--- a/keyboards/kopibeng/xt60_singa/info.json
+++ b/keyboards/kopibeng/xt60_singa/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index 85079802b67..dd2eca9807c 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json
index cd724d34d84..d97b755f965 100644
--- a/keyboards/kopibeng/xt65/info.json
+++ b/keyboards/kopibeng/xt65/info.json
@@ -21,6 +21,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 12,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 5210c8fadf5..650623f0d97 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -18,7 +18,6 @@
#define INDICATOR_PIN_0 B13
- #define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json
index e9db42d9390..37e3dd6e6fb 100644
--- a/keyboards/kopibeng/xt8x/info.json
+++ b/keyboards/kopibeng/xt8x/info.json
@@ -21,6 +21,7 @@
"pin": "A10"
},
"rgblight": {
+ "led_count": 19,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index fb73fedb045..de59f7015ca 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/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
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
index 262ce39fba2..6aae3c48eb4 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/info.json
@@ -8,6 +8,9 @@
"pid": "0x016B",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index c1e97c7decd..6295678002a 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 0d33a5ddbbb..1934d3d4daa 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 10,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
index 8f72c8fb8df..afd1de32117 100755
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 53
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index 0b0cbd01f5e..6f00b3d1aa5 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -12,6 +12,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 53,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index eebd3381d57..6a3bee5a52d 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_MATRIX_LED_COUNT 69
-# define RGBLED_NUM 69
# define RGB_MATRIX_KEYPRESSES
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index c2aafb9adc9..bb35256190a 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -16,7 +16,6 @@
#pragma once
//rgb light setting
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index bb6533b823f..1ec6bb9ab91 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -15,6 +15,7 @@
"driver": "custom"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index a11d5792397..2f02594e156 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_MATRIX_LED_COUNT 69
- #define RGBLED_NUM 69
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index 1cc17d6c866..f3d8b146847 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -16,7 +16,6 @@
#pragma once
//rgb light setting
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index d91f6a85317..0b7d8d2c68c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -15,6 +15,7 @@
"driver": "IS31FL3733"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 506610a5e85..96e838b2533 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_MATRIX_LED_COUNT 70
-# define RGBLED_NUM 70
# define RGB_MATRIX_KEYPRESSES
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 6e9256523f2..800ff0de311 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -14,9 +14,6 @@
"rgb_matrix": {
"driver": "WS2812"
},
- "rgblight": {
- "max_brightness": 180
- },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 7af983c5e77..ee4f4a979f6 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -18,7 +18,6 @@
#pragma once
//rgb light setting
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -106,7 +105,7 @@
#ifdef RGBLIGHT_ENABLE
# define WS2812_LED_TOTAL 0
#else
-# define WS2812_LED_TOTAL RGBLED_NUM
+# define WS2812_LED_TOTAL 6
#endif
#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 6326d871df2..701a5bca19b 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -15,6 +15,7 @@
"driver": "custom"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 5cbf2ce5e95..c0a30e51254 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_MATRIX_LED_COUNT 67
- #define RGBLED_NUM 67
#define RGB_MATRIX_KEYPRESSES
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index d74223e107c..11aa2657e64 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -15,6 +15,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 67,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 2feead3386f..12111c48f1d 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -16,7 +16,6 @@
#pragma once
//rgb light setting
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -102,7 +101,7 @@
#ifdef RGBLIGHT_ENABLE
# define WS2812_LED_TOTAL 0
#else
-# define WS2812_LED_TOTAL RGBLED_NUM
+# define WS2812_LED_TOTAL 6
#endif
#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 01d09b59460..0adf611aae3 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -15,6 +15,7 @@
"driver": "custom"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index e2522723fc8..ef410e94412 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 73
- #define RGBLED_NUM 73
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 235f11eef9b..8718c066d05 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_MATRIX_LED_COUNT 74
- #define RGBLED_NUM 74
#define RGB_MATRIX_KEYPRESSES
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index e1205e248b1..30c75e448aa 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -10,6 +10,7 @@
"force_nkro": true
},
"rgblight": {
+ "led_count": 74,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index cef5a0939b2..a3ef1df3b35 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 74
-# define RGBLED_NUM 74
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index b3747af5b16..a965121f646 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -14,9 +14,6 @@
"rgb_matrix": {
"driver": "WS2812"
},
- "rgblight": {
- "max_brightness": 180
- },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 53aabdaf948..2ea220c70cb 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -16,9 +16,6 @@
*/
#pragma once
-#define USB_POLLING_INTERVAL_MS 1
-
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index b7c827e0eac..263e132e2e6 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -15,6 +15,7 @@
"driver": "IS31FL3741"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index a9ba033fb0e..fdd928e6fe7 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 87
-#define RGBLED_NUM 87
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 7ecc626803a..73c222c113f 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 98
-# define RGBLED_NUM 98
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index ef9be1f6f45..63dba82432f 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 4
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index fefd60be790..90b9dab4a14 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -18,6 +18,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h
index d77984fc699..d9bc6bc9fb7 100644
--- a/keyboards/kprepublic/jj40/config.h
+++ b/keyboards/kprepublic/jj40/config.h
@@ -15,8 +15,6 @@ along with this program. If not, see .
#pragma once
/* RGB underglow */
-// NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLED_NUM 5
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json
index 2627ffbff95..e42de6f2711 100644
--- a/keyboards/kprepublic/jj40/info.json
+++ b/keyboards/kprepublic/jj40/info.json
@@ -19,6 +19,9 @@
"levels": 12,
"breathing": true
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
index 5646d4c6536..2e1fefef999 100644
--- a/keyboards/kprepublic/jj4x4/config.h
+++ b/keyboards/kprepublic/jj4x4/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB underglow */
-// NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json
index fce30c67b04..35a4de519fc 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/info.json
@@ -19,6 +19,9 @@
"levels": 12,
"breathing": true
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
index 3220fd6477d..81f567f8e00 100644
--- a/keyboards/kprepublic/jj50/config.h
+++ b/keyboards/kprepublic/jj50/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index a83d42ab6ab..8cccf2b5888 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -18,6 +18,9 @@
"levels": 12,
"breathing": true
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index bb568aef385..401511982ba 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 12
# define RGBLIGHT_SAT_STEP 25
# define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index ddd45dae05c..0b7d7d83d50 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -21,6 +21,9 @@
"caps_lock": "C6",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index 31f2930ac17..58fa32d0525 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define RGBLED_NUM 1 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index 3600de0c358..da277a0ae05 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -19,6 +19,7 @@
"pin": "C6"
},
"rgblight": {
+ "led_count": 1,
"max_brightness": 200
},
"processor": "atmega32u2",
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index 7506090b1ed..5a731362867 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index 7c106b14484..61ccbcde1af 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index 80ac84c64fa..2f5a7ceafe1 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index efb55bb9895..815e53f2f22 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index 80ac84c64fa..2f5a7ceafe1 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 9dab738c388..37ceadaea44 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index 7506090b1ed..5a731362867 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index a7e73c84ae7..556c0efdde2 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h
index 84d08bce543..2437f4fa0c4 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kudox_full/rev1/config.h
@@ -8,8 +8,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json
index 45958b56c99..24a45fb1675 100644
--- a/keyboards/kudox_full/rev1/info.json
+++ b/keyboards/kudox_full/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index 5fddd8102a2..c01494287fd 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index 7868308eadb..8ae87554049 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index 7b6ef67bd97..14945ae12d7 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 4a441b73855..41565a6a429 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "2.0.0"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index 193e83efe90..34a7ec6ba77 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json
index 797627865e3..c88af7f9f0a 100644
--- a/keyboards/labyrinth75/info.json
+++ b/keyboards/labyrinth75/info.json
@@ -16,6 +16,9 @@
"bootmagic": {
"matrix": [0, 2]
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index b8fd564c4f5..85a1f71ba4f 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -95,7 +95,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_SAT_STEP 5
#define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index 6c759d1a397..33da10b4635 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 627b4be9a8c..6c5f2226ba1 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index b9a9b7eb952..426e4ab242e 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -13,6 +13,9 @@
"rows": ["D0", "D1", "D2", "D3"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 326f4795c00..4e61d819c1e 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -15,9 +15,6 @@ along with this program. If not, see .*/
#pragma once
-#define RGBLED_NUM 2
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
#define RGBLIGHT_VAL_STEP 25
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
index d59a5fb02c5..ebf2c6d976d 100644
--- a/keyboards/latincompass/latin64ble/info.json
+++ b/keyboards/latincompass/latin64ble/info.json
@@ -8,6 +8,9 @@
"pid": "0x6C71",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index d166baebc7d..d68f3b92418 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -18,8 +18,7 @@ along with this program. If not, see .*/
#define SSD1306OLED
-#define RGBLED_NUM 18
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 18
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
index 03650873c06..4836ed62727 100644
--- a/keyboards/lazydesigners/bolt/config.h
+++ b/keyboards/lazydesigners/bolt/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 13
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json
index 7dd6a491ac7..4b8e756486d 100644
--- a/keyboards/lazydesigners/bolt/info.json
+++ b/keyboards/lazydesigners/bolt/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 13,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h
index 605e9ea5e23..7d60baf76c5 100755
--- a/keyboards/lazydesigners/cassette8/config.h
+++ b/keyboards/lazydesigners/cassette8/config.h
@@ -27,7 +27,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 15
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json
index 65141cc9fcb..e4fb627f5f9 100755
--- a/keyboards/lazydesigners/cassette8/info.json
+++ b/keyboards/lazydesigners/cassette8/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 15,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 316b896eb34..70bd5789e58 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 50
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
index 0045ec1af8d..e05754d0b89 100644
--- a/keyboards/lazydesigners/dimple/ortho/info.json
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 50,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 44aa78dfa8e..c0fefad6eb7 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 50,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
index aa2057509e8..4836ed62727 100644
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ b/keyboards/lazydesigners/dimpleplus/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 8
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index b19286c079a..4deb68ad639 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
index c4b07c4a7be..f360d13fdeb 100644
--- a/keyboards/lazydesigners/the40/config.h
+++ b/keyboards/lazydesigners/the40/config.h
@@ -17,7 +17,6 @@
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index 1c1c6cfda0d..c13914fac02 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 4586df1da2d..5f360813239 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -5,5 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 1
diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json
index f8b11c8baeb..0c76516e803 100644
--- a/keyboards/lazydesigners/the50/info.json
+++ b/keyboards/lazydesigners/the50/info.json
@@ -18,6 +18,7 @@
"levels": 6
},
"rgblight": {
+ "led_count": 1,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
index 8671583f548..5d9d4c7e75f 100755
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ b/keyboards/lazydesigners/the60/rev2/config.h
@@ -17,7 +17,6 @@
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json
index 3f8c02b49c4..bb9d3b90a79 100755
--- a/keyboards/lazydesigners/the60/rev2/info.json
+++ b/keyboards/lazydesigners/the60/rev2/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
index d8b9a4fa0be..935f89491ec 100644
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ b/keyboards/leafcutterlabs/bigknob/config.h
@@ -28,4 +28,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5 // Number of LEDs
diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json
index 1361138549a..f411b702daa 100644
--- a/keyboards/leafcutterlabs/bigknob/info.json
+++ b/keyboards/leafcutterlabs/bigknob/info.json
@@ -13,6 +13,9 @@
{"pin_a": "D0", "pin_b": "D2"}
]
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/leeku/finger65/config.h b/keyboards/leeku/finger65/config.h
deleted file mode 100644
index 0626eb5d0e6..00000000000
--- a/keyboards/leeku/finger65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2018 Rasmus Schults
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-
-#define RGBLED_NUM 12
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index a7b7c4843e0..0b8941e7760 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -23,8 +23,6 @@ along with this program. If not, see .
/* 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.
diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json
index 3c9cea5e5ee..6f00161cd5d 100644
--- a/keyboards/lets_split/rev1/info.json
+++ b/keyboards/lets_split/rev1/info.json
@@ -14,6 +14,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index a30fed60780..0b8941e7760 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -23,8 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json
index d25e6de6112..8c6d622732f 100644
--- a/keyboards/lets_split/rev2/info.json
+++ b/keyboards/lets_split/rev2/info.json
@@ -14,6 +14,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h
index 3655ec19c50..dee5c458b22 100644
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12 // Number of LEDs
-
/* Audio settings */
#ifdef AUDIO_ENABLE
#define AUDIO_PIN C6 // Define this to enable the buzzer
diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json
index cf716c05070..76972243dc4 100644
--- a/keyboards/lets_split/sockets/info.json
+++ b/keyboards/lets_split/sockets/info.json
@@ -14,6 +14,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index ae682e447f4..49b58eec2fb 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -1,10 +1,7 @@
#pragma once
-#define RGBLED_NUM 20 // Number of LEDs
-
#define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
-#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json
index 894a0095831..2a15d5c240a 100644
--- a/keyboards/lfkeyboards/lfk65_hs/info.json
+++ b/keyboards/lfkeyboards/lfk65_hs/info.json
@@ -16,6 +16,9 @@
"backlight": {
"levels": 8
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/lfk78/revb/config.h b/keyboards/lfkeyboards/lfk78/revb/config.h
deleted file mode 100644
index 377ea211232..00000000000
--- a/keyboards/lfkeyboards/lfk78/revb/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 31
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json
index 92662bacc78..a3f841bdd19 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"levels": 8
},
+ "rgblight": {
+ "led_count": 31
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/lfk78/revc/config.h b/keyboards/lfkeyboards/lfk78/revc/config.h
deleted file mode 100644
index 78343dc888c..00000000000
--- a/keyboards/lfkeyboards/lfk78/revc/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json
index 830205c584c..0e2a8132e0c 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"levels": 8
},
+ "rgblight": {
+ "led_count": 27
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h
deleted file mode 100644
index 78343dc888c..00000000000
--- a/keyboards/lfkeyboards/lfk78/revj/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 8f9198b089d..af37dc6fdb1 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"levels": 8
},
+ "rgblight": {
+ "led_count": 27
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 5393e47b391..c4b1743a0b2 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 28
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json
index d4abb0abdd1..4e2e1a0bf47 100644
--- a/keyboards/lfkeyboards/lfkpad/info.json
+++ b/keyboards/lfkeyboards/lfkpad/info.json
@@ -8,6 +8,9 @@
"pid": "0x3231",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 28
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index c367ad95c3c..3a8f16e0fd5 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 26 // Number of LEDs
-
#define AUDIO_VOICES
#define AUDIO_PIN C6
diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index cf1cc7764bb..0e130f30b39 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"levels": 10
},
+ "rgblight": {
+ "led_count": 26
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index af7f6b17b82..dc8021c7bf8 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION COL2ROW
#define MATRIX_ROW_PINS {D6, D7, E0, C3, C4}
#define MATRIX_COL_PINS {F2, C5, E5, E4, B7, B6, B5, B4, B3, B2, B1, B0, E1, C0, C1, C2}
-#define RGBLED_NUM 20 // Number of LEDs
//RevB only:
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
-#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json
index f635133e9ad..960640ac77c 100644
--- a/keyboards/lfkeyboards/smk65/revb/info.json
+++ b/keyboards/lfkeyboards/smk65/revb/info.json
@@ -5,6 +5,9 @@
"backlight": {
"levels": 8
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h
index 50ce3410539..9e32ac9d3fe 100644
--- a/keyboards/lfkeyboards/smk65/revf/config.h
+++ b/keyboards/lfkeyboards/smk65/revf/config.h
@@ -31,8 +31,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
-#define RGBLED_NUM 28
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json
index 63e9d0abc75..086e7e38c8b 100644
--- a/keyboards/lfkeyboards/smk65/revf/info.json
+++ b/keyboards/lfkeyboards/smk65/revf/info.json
@@ -4,6 +4,9 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "rgblight": {
+ "led_count": 28
+ },
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
deleted file mode 100644
index 84f3b40bc9c..00000000000
--- a/keyboards/lily58/glow_enc/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-Copyright 2020 Ben Roesner (keycapsss.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 72 // Number of LEDs
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
index 2b3e2700266..006cf0aa210 100644
--- a/keyboards/lily58/glow_enc/info.json
+++ b/keyboards/lily58/glow_enc/info.json
@@ -38,6 +38,7 @@
"pin": "F4"
},
"rgblight": {
+ "led_count": 72,
"max_brightness": 120,
"split_count": [36, 36]
},
diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h
deleted file mode 100644
index b8a5d05e15c..00000000000
--- a/keyboards/lily58/light/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-Copyright 2020 Ben Roesner (keycapsss.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 70
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
index ca3ad342fb6..1c556e429a6 100644
--- a/keyboards/lily58/light/info.json
+++ b/keyboards/lily58/light/info.json
@@ -39,6 +39,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 70,
"max_brightness": 120,
"split_count": [35, 35]
},
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
deleted file mode 100644
index 8e94f9f62b7..00000000000
--- a/keyboards/lily58/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json
index a3e89ec3a75..6f341915bff 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -20,6 +20,9 @@
"enabled": true,
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 2c8d4845b13..3f549797d89 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* Define RGB */
-#define RGBLED_NUM 67
#define RGB_MATRIX_LED_COUNT 67
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index ae1d70710a2..948b8955486 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
/* Underglow */
-#define RGBLED_NUM 40
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index 77fd539b74c..937a9e5393e 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 40,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index ef57446100d..e84a0ec9296 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* Define RGB */
-#define RGBLED_NUM 87
#define RGB_MATRIX_LED_COUNT 87
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 8b783a52cda..133b2a973ba 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* Underglow */
#define WS2812_EXTERNAL_PULLUP // This board uses a pull-up + 5 V tolerant GPIO in open drain config ro generate a 5 V signal
-#define RGBLED_NUM 18
/* section for PWM WS2812 driver */
#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index ffb02e57e16..3385f5371d8 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -9,6 +9,7 @@
"force_nkro": true
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h
deleted file mode 100644
index 3a5b0356a94..00000000000
--- a/keyboards/littlealby/mute/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 albybarber
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json
index a6392a76e78..a4a2a5822ec 100644
--- a/keyboards/littlealby/mute/info.json
+++ b/keyboards/littlealby/mute/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"max_power": 100
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index b4d4367f1db..4ee4b5a9975 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -2,9 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* rgb underglow */
-#define RGBLED_NUM 6
-
/* misc */
#define LAYER_STATE_8BIT
#define NO_ACTION_TAPPING
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index 6208b749f93..cde72e5882f 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -21,6 +21,9 @@
"bootmagic": {
"matrix": [1, 0]
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index 1fe8d704b6e..f91c341b140 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 41
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index 5fa227b4bf3..1d59dca521a 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -18,6 +18,7 @@
"num_lock": "B7"
},
"rgblight": {
+ "led_count": 41,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 750a12d64f0..749321732fb 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 5
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#define RGBLED_NUM 37
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
index a1a5e3ef06c..5442a3e8139 100644
--- a/keyboards/loki65/info.json
+++ b/keyboards/loki65/info.json
@@ -8,6 +8,9 @@
"pid": "0x4C36",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 37
+ },
"ws2812": {
"pin": "A9",
"driver": "pwm"
diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h
index 91357b0375f..9430c3b672b 100644
--- a/keyboards/longnald/corin/config.h
+++ b/keyboards/longnald/corin/config.h
@@ -18,7 +18,6 @@
#pragma once
-# define RGBLED_NUM 64
# define RGBLIGHT_HUE_STEP 20
# define RGBLIGHT_SAT_STEP 20
# define RGBLIGHT_VAL_STEP 40
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
index 7fdb386f730..6e7cdaa7bf8 100644
--- a/keyboards/longnald/corin/info.json
+++ b/keyboards/longnald/corin/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 959fe0bfcaf..efcc4caded4 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION ROW2COL
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 28
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json
index 08a9f41d559..fe69ea3e536 100644
--- a/keyboards/lz/erghost/info.json
+++ b/keyboards/lz/erghost/info.json
@@ -13,6 +13,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 28,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index 3871c9b3e5a..e972abe837e 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define SELECT_SOFT_SERIAL_SPEED 1
-# define RGBLED_NUM 68
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# ifndef IOS_DEVICE_ENABLE
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
index 3f75de7ddfb..c37bfb1d687 100644
--- a/keyboards/manta60/info.json
+++ b/keyboards/manta60/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 68,
"split_count": [34, 34]
},
"ws2812": {
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
deleted file mode 100644
index 39274737112..00000000000
--- a/keyboards/manyboard/macro/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 William Ehman
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* RGB Pins */
-#define RGBLED_NUM 2
diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json
index 3df9a79430a..10218337d96 100644
--- a/keyboards/manyboard/macro/info.json
+++ b/keyboards/manyboard/macro/info.json
@@ -22,6 +22,7 @@
"pin": "B6"
},
"rgblight": {
+ "led_count": 2,
"max_brightness": 10
},
"processor": "atmega32u4",
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 59679e27535..71417380a92 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -27,6 +27,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6 // Number of LEDs
#define TAPPING_TERM 200
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index b799baa28c7..27f9ae18079 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,6 +8,9 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index 7cf73259b44..05d2733f8b3 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 81c23850ec4..9e7ec96748d 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x6007",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 27de26f6b8e..ad601d7d360 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#pragma once
/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs (each hand)
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index f14888862f0..5df74d73b6d 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index e3b34d1bf00..3182936d760 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 1 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 336d48af4c6..6848fe66b08 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -8,6 +8,9 @@
"pid": "0x6007",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 50bdd30c855..de0af78b300 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 723787f4268..237019f339b 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index c5e0aee8a19..aca844bff74 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 40
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
@@ -34,8 +33,7 @@ along with this program. If not, see .
#endif
#ifdef RGB_MATRIX_ENABLE
- #define RGBLED_NUM 40 // Number of LEDs
- #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+ #define RGB_MATRIX_LED_COUNT 40
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 0f471f4e39e..45e5489c993 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -23,6 +23,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 40,
"max_brightness": 150,
"sleep": true,
"split_count": [20, 20]
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 93ab8c03c6e..dc791335d9b 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 95f20f21b8d..b96cdebde0b 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -4,6 +4,7 @@
"device_version": "0.1.5"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 44ff8b29465..291c7d588b8 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 64b41b1b8cb..a746790d44f 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -4,6 +4,7 @@
"device_version": "0.1.0"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 838b1431cce..3444d07be50 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 5c5401d95a1..ae57bc57636 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 12,
"max_brightness": 220,
"sleep": true
},
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index a1eaecf36e3..7f6793b9790 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -90,7 +90,6 @@
// rgb light setting
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
index 60a272dc1f6..f020f429d6c 100644
--- a/keyboards/matrix/abelx/info.json
+++ b/keyboards/matrix/abelx/info.json
@@ -8,6 +8,9 @@
"pid": "0xAB87",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index 6bccbfbc217..b7ae4082424 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -30,8 +30,6 @@
#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
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 827690e3c68..b2ceda7e650 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 14,
"sleep": true,
"led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3]
},
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index d817e8b6f24..4d7eb62efaa 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -27,7 +27,6 @@
//#define NO_PRINT
//rgb light setting
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index 6c0bb7b085e..86cfbe66fe2 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "E2"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index db94fb2a9a1..5ed4aa00755 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -42,6 +42,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 16
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index 7f5942a82e5..8187c815398 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -13,6 +13,7 @@
"scroll_lock": "B5"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index bb47aaf286a..353521e6b8a 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -14,7 +14,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
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index e20234efa4f..7eb5c328d58 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 421773affc1..5e301cf1c44 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -79,7 +79,6 @@
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
// rgb light setting
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -94,4 +93,4 @@
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 20
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 7d88bb81f5b..25abd258276 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -8,6 +8,9 @@
"pid": "0x20AD",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 8ee1b57bde7..2ba6684fd7e 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -27,7 +27,6 @@
//#define NO_PRINT
//rgb light setting
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index 935035317cc..2cc91e32208 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -17,6 +17,9 @@
"caps_lock": "E6",
"scroll_lock": "D2"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 5a74ab52068..05b2a0a5f1b 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -75,7 +75,6 @@
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* indicator rgb */
-#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 33dedc6bce0..67c5fe02212 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,6 +8,9 @@
"pid": "0x0065",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 0b552acfda0..c6cf684b8eb 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -31,7 +31,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2 // number of LEDs
/*
* Feature disable options
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 2d3b6e8a4be..004545cbbf1 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index 762f183b005..5135b7049ea 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB Underglow */
- #define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index 348818ea0d1..9941c93b122 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index ae92085bde4..7fac8316cf0 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -27,7 +27,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
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index ce113f1353d..c8c0392da9e 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 8f261b69f25..d8d51dbdb29 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -32,7 +32,6 @@
#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
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 422b3f6270a..a1f6677ef69 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -21,6 +21,9 @@
"caps_lock": "B2",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index 16e59303644..021d49fce14 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 10
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index 5251bc600b8..300364005c5 100644
--- a/keyboards/mechkeys/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"breathing": true
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index a7436fb00c1..5f4a59674b2 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -22,7 +22,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 40d67108297..769749ccb78 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -23,6 +23,9 @@
"scroll_lock": "B1",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index f76d0f01e1c..2e1fefef999 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB underglow */
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index eea1d15feba..e8cb6f16bf6 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 9517f6a7317..6cd3f0e231c 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -31,7 +31,6 @@
#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
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 53f60637f97..84b73be44e3 100644
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ b/keyboards/mechkeys/mechmini/v2/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 6ee939f23c9..39ae589193f 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index fee9951e738..6b34629ef4b 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
deleted file mode 100644
index 1aee08380ca..00000000000
--- a/keyboards/mechllama/g35/v1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 Kaylyn Bogle
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json
index c5d4c69e7b7..36d542dc586 100644
--- a/keyboards/mechllama/g35/v1/info.json
+++ b/keyboards/mechllama/g35/v1/info.json
@@ -6,5 +6,8 @@
"cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"],
"rows": ["F5", "F6", "F4", "F1", "D4"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 41
+ }
}
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
deleted file mode 100644
index 7c15560a1a7..00000000000
--- a/keyboards/mechllama/g35/v2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 Kaylyn Bogle
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json
index 563625f428b..aa6bab75254 100644
--- a/keyboards/mechllama/g35/v2/info.json
+++ b/keyboards/mechllama/g35/v2/info.json
@@ -6,5 +6,8 @@
"cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"],
"rows": ["F5", "F4", "F1", "F0", "D4"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 6
+ }
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 1e549f9a898..59a4427981d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 4ac693f894c..e3a711736ef 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -16,6 +16,9 @@
{"pin_a": "A4", "pin_b": "A3"}
]
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "A15"
},
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index c4f801b40de..6680bb246fc 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#ifdef RGBLIGHT_ENABLE
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index d1775ccb83b..a4b71a19383 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -23,6 +23,9 @@
"num_lock": "A0",
"scroll_lock": "C15"
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "A7",
"driver": "spi"
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index 1c9b61b9df8..d7169c04434 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
-#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index 9c6bd46a702..c4b97fbd78f 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -9,6 +9,9 @@
"pin": "B0",
"breathing": true
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "A7"
},
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index 0e23efaf3ad..b4c3ab93e82 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL
-#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index 31de7de9575..61904c585f2 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -14,6 +14,9 @@
"pin": "B5",
"breathing": true
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
index eafe7726654..79571978e30 100644
--- a/keyboards/mechlovin/delphine/mono_led/config.h
+++ b/keyboards/mechlovin/delphine/mono_led/config.h
@@ -2,7 +2,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json
index 71756a3daa0..c59d9fbf2d0 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/info.json
@@ -4,6 +4,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 13,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 18b2e78d05b..0f5432e977c 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -1,7 +1,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index d3ba766de4d..26729d44943 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -4,6 +4,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 13,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index a508e4f24f5..54ef985e9af 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index 7023dc18e2c..5e05fd12bfc 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 81335f31be9..641a33378ea 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -1,7 +1,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 18
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 61ce6898c82..04d6db27c00 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,6 +8,9 @@
"pid": "0x6002",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "A15"
},
diff --git a/keyboards/mechlovin/hannah910/rev1/config.h b/keyboards/mechlovin/hannah910/rev1/config.h
deleted file mode 100644
index 7b793c75b91..00000000000
--- a/keyboards/mechlovin/hannah910/rev1/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 9
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
index 49eb2af5c10..0dea587cb50 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/hannah910/rev2/config.h b/keyboards/mechlovin/hannah910/rev2/config.h
deleted file mode 100644
index c37c581ae61..00000000000
--- a/keyboards/mechlovin/hannah910/rev2/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 28
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index 43f6ab51a10..177831d1532 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 28
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/hannah910/rev3/config.h b/keyboards/mechlovin/hannah910/rev3/config.h
deleted file mode 100644
index fbb878ab6aa..00000000000
--- a/keyboards/mechlovin/hannah910/rev3/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 28
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index d6b606913d3..df5a850bf57 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 28
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
index 68ee0c54797..8427cb2140d 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 26
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index 99401953e1e..f042e947618 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 26,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index ac00293d827..205f8c7abc2 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -35,7 +35,6 @@
#define DIODE_DIRECTION ROW2COL
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index ff98dd28e54..19868b66fed 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -18,6 +18,7 @@
"scroll_lock": "B4"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index e21a4463531..9f5eaf5d875 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
-#define RGBLED_NUM 26
/*== all animations enable ==*/#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index cd8d87eb343..d69b97712f3 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -22,6 +22,7 @@
"num_lock": "A3"
},
"rgblight": {
+ "led_count": 26,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index 88c6c21dfa6..061ea19c092 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 31
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index 1c49d541065..35cec0e6990 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 31
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index bfa29088903..c7bed0450a3 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 1e8dafd2d74..1ac79221b76 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index 766455991b8..8a6f5afd631 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 549a00fe20d..f2ed7367c7b 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -17,6 +17,7 @@
"caps_lock": "B0"
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index af7979c0c19..8a6f5afd631 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 8d6872ad634..14aace0170a 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -18,6 +18,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index 5e08eb5615d..5c86bf96044 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
/*== all animations enable ==*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index c1aab7d24c0..51ba7cdf5c5 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -13,6 +13,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index 312b95860fe..271830740bf 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL
-#define RGBLED_NUM 27
/*== all animations enable ==*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 3864a45fa29..5152ece20db 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -18,6 +18,7 @@
"scroll_lock": "B2"
},
"rgblight": {
+ "led_count": 27,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index a1127f6aadb..4630f81cac6 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 26
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 81893874e0d..f1ceec7ed82 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,9 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 26
+ },
"ws2812": {
"pin": "A7"
},
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index c7187dae3e7..350695d34cf 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 366ed469342..de3ac401ebf 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -19,6 +19,7 @@
"scroll_lock": "A14"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 3a7da2efae1..9fb77b22d33 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 3ac6c0e52a0..7a63c54d859 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -20,6 +20,7 @@
"caps_lock": "B2"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 63dee10a578..c67b965609f 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION ROW2COL
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index db4f017f531..9288254f053 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -18,6 +18,7 @@
"scroll_lock": "B4"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index bcd8ac989d6..632d8c92bc9 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 22
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index 4b2ff8b9fba..68395ba521c 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -17,6 +17,7 @@
"caps_lock": "A4"
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 3b7f3e6d1b7..f40f4cd0186 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -61,7 +61,6 @@ along with this program. If not, see .
#define VIA_QMK_LED_MATRIX_ENABLE
#endif
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index 89498528559..2374a4ee918 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index 6963ef94e73..6586815614c 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
#define WS2812_SPI SPID2 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index c1df85a776e..916f107b5dd 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -17,6 +17,7 @@
"caps_lock": "C14"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index 36d3166957b..0145ca49bd9 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json
index 4f2a1786652..e3cf711beb9 100644
--- a/keyboards/mechstudio/ud_40_ortho/info.json
+++ b/keyboards/mechstudio/ud_40_ortho/info.json
@@ -18,6 +18,7 @@
"esc_output": "F0"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 05b2baf6cad..49c98b2398d 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -15,7 +15,6 @@
#define SPLIT_OLED_ENABLE
/* RGB options */
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index fcc137877b2..5fce89abbfd 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -22,6 +22,7 @@
"soft_serial_pin": "D3"
},
"rgblight": {
+ "led_count": 16,
"sleep": true,
"split_count": [8, 8]
},
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index de5d1937eeb..68190083cf6 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -15,7 +15,6 @@
#define SPLIT_OLED_ENABLE
/* RGB options */
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 17214ae6e30..23f7edb102d 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -22,6 +22,7 @@
"soft_serial_pin": "D3"
},
"rgblight": {
+ "led_count": 16,
"sleep": true,
"split_count": [8, 8]
},
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index f75085b0fa2..c73094e2718 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c"
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 72068bc19d8..23d618f2fbe 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -23,6 +23,7 @@
"matrix": [0, 1]
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index dae58e13ad0..240886e7c15 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
/* RGB settings, uncomment this define to enable RGB */
-# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index 4a8747143ee..72d0910304e 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -26,6 +26,7 @@
"matrix": [5, 4]
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 9c743be4340..576976c2ea5 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -32,7 +32,6 @@
#define TAP_CODE_DELAY 10
/* RGB settings, uncomment this define to enable RGB */
-# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index 617c212635e..a106a9ec99a 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -24,6 +24,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index d4334804c54..240886e7c15 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
/* RGB settings, uncomment this define to enable RGB */
-# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 8c54eb67ebd..f349eb8b2de 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.1"
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index e5f456306d9..12e4413a7a6 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json
index f192bb50363..45d6758a79d 100644
--- a/keyboards/mehkee96/info.json
+++ b/keyboards/mehkee96/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index cfbd6c5294d..10d5c761689 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index 6372bc8d727..66a6e6cb592 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -21,6 +21,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index d9d3ca39c8f..17703836173 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -28,7 +28,6 @@
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
# define RGBLIGHT_DEFAULT_SPD 10
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index 25ecb448ddc..dbe5399b9a9 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -10,6 +10,7 @@
"levels": 10
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h
index 20de09ce921..aacf48e9c4f 100644
--- a/keyboards/meow48/config.h
+++ b/keyboards/meow48/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define OLED_BRIGHTNESS 100
- #define RGBLED_NUM 48
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
index 3e0c1723708..936732a8ae7 100644
--- a/keyboards/meow48/info.json
+++ b/keyboards/meow48/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 48,
"max_brightness": 100,
"sleep": true
},
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 486e6a48a0e..b62efc4aaea 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index a3b0b778e87..818b34b78ca 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index b68c84b4268..04569dc9894 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -20,9 +20,8 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
-#define RGBLED_NUM 83
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 83
# define RGB_MATRIX_SPLIT { 39, 44 }
#endif
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index e3e976d2f93..95f3bb1cea2 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -25,6 +25,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 83,
"max_brightness": 150,
"sleep": true,
"split_count": [39, 44]
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 396d6ef87e8..70a5d7ba590 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -20,9 +20,8 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
-#define RGBLED_NUM 100
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 100
# define RGB_MATRIX_SPLIT { 48, 52 }
#endif
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 0cdec21a3c5..554d1997a36 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -25,6 +25,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 100,
"max_brightness": 120,
"sleep": true,
"split_count": [48, 52]
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index e89175723b4..684a24c9717 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define USE_I2C
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index a078bd163fc..4b079696e15 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -16,6 +16,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 10,
"sleep": true,
"split_count": [5, 5]
},
diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h
index ef340432374..8596b47af3b 100644
--- a/keyboards/mexsistor/ludmila/config.h
+++ b/keyboards/mexsistor/ludmila/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json
index 0fc10ca6a72..a270e76ade5 100644
--- a/keyboards/mexsistor/ludmila/info.json
+++ b/keyboards/mexsistor/ludmila/info.json
@@ -14,6 +14,7 @@
]
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mincedshon/ecila/config.h b/keyboards/mincedshon/ecila/config.h
index 092ba58d37b..296a0d7a44b 100644
--- a/keyboards/mincedshon/ecila/config.h
+++ b/keyboards/mincedshon/ecila/config.h
@@ -13,7 +13,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json
index 4ec8b61161b..ddaa334d741 100644
--- a/keyboards/mincedshon/ecila/info.json
+++ b/keyboards/mincedshon/ecila/info.json
@@ -11,6 +11,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 8d0955d7695..729112a021b 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json
index 6f6c68d8d09..9fe71663562 100644
--- a/keyboards/miniaxe/info.json
+++ b/keyboards/miniaxe/info.json
@@ -11,6 +11,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
index 317e1509359..b669fed3f7b 100644
--- a/keyboards/minimacro5/config.h
+++ b/keyboards/minimacro5/config.h
@@ -31,4 +31,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5 // Number of LEDs
diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json
index e417a689ae4..a48527ee084 100644
--- a/keyboards/minimacro5/info.json
+++ b/keyboards/minimacro5/info.json
@@ -8,6 +8,9 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h
index 4082490fb56..8d555dcf9f3 100644
--- a/keyboards/minimon/index_tab/config.h
+++ b/keyboards/minimon/index_tab/config.h
@@ -21,8 +21,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 10
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json
index cbf1f316a54..0e60aa13278 100644
--- a/keyboards/minimon/index_tab/info.json
+++ b/keyboards/minimon/index_tab/info.json
@@ -10,6 +10,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index b36045f4d0b..f01a9e0ebb6 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 8
-
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index cdec63f48f3..b649a88c0ac 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 8,
"split": true
},
"ws2812": {
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index 55e57fb8728..3f7b2a040fc 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index 65087ac4818..09a0c094e57 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index eba5475d833..6ce2c3a7065 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 19
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 2fc140cba61..2b3d9230bdd 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 19
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 2cc286468e7..dcb25e4d719 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json
index 0d73f3ca686..9c6f0610341 100644
--- a/keyboards/misterknife/knife66/info.json
+++ b/keyboards/misterknife/knife66/info.json
@@ -13,6 +13,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index d2642f3cfd8..301bd4e10b9 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json
index f7c3c68f3bb..d546af23d86 100644
--- a/keyboards/misterknife/knife66_iso/info.json
+++ b/keyboards/misterknife/knife66_iso/info.json
@@ -13,6 +13,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 160,
"sleep": true
},
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index 76fa3df3f42..3182936d760 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see .
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 17 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json
index 0c1c5d7c44e..80f8e18bb01 100644
--- a/keyboards/miuni32/info.json
+++ b/keyboards/miuni32/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index 5ee863e0240..635393434ea 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -6,7 +6,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json
index 7a69ec93fad..43c7d8df69a 100644
--- a/keyboards/mixi/info.json
+++ b/keyboards/mixi/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index 303b7ae5b54..49860215fa0 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -18,7 +18,6 @@
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_LAYERS
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json
index 4ccf9ede92b..99c71ad37ab 100644
--- a/keyboards/mlego/m48/rev1/info.json
+++ b/keyboards/mlego/m48/rev1/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index dc6c4c225da..71050b6ad43 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -19,7 +19,6 @@
#define RGBLIGHT_LAYERS
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
index bbe9f861129..112b590f543 100644
--- a/keyboards/mlego/m60/rev1/info.json
+++ b/keyboards/mlego/m60/rev1/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index ea26c474aea..6f08c76e46f 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -28,8 +28,6 @@
#define RGBLIGHT_DEFAULT_HUE 213
-#define RGBLED_NUM 16
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 8d236baac16..deeffe77532 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -22,6 +22,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 128,
"split_count": [8, 8]
},
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index 5431a749e08..7373aa2adf7 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -27,7 +27,6 @@
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_LAYERS
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index f0e64efb0be..bfa70ec0bdc 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -19,6 +19,7 @@
"scroll_lock": "B13"
},
"rgblight": {
+ "led_count": 16,
"split_count": [8, 8]
},
"ws2812": {
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index 2ed846b1708..22e463a8566 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -19,8 +19,6 @@ along with this program. If not, see .
#define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index 3c939ef4c28..ebc79fbe963 100644
--- a/keyboards/mlego/m65/rev1/info.json
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index 791b73e2f6f..47672b678cd 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -19,8 +19,6 @@ along with this program. If not, see .
#define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index 64df0a2ba6f..68c1ba91337 100644
--- a/keyboards/mlego/m65/rev2/info.json
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index 81f02bc4111..824f66d57d4 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see .
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index b72b7065877..577973e9d3b 100644
--- a/keyboards/mlego/m65/rev3/info.json
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index 942f3606883..3ab8aef5cc0 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see .
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index d671845e626..86e3ea36e27 100644
--- a/keyboards/mlego/m65/rev4/info.json
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -18,6 +18,9 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 9f4cc586e4c..e4bf78dff0e 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define SELECT_SOFT_SERIAL_SPEED 5
-#define RGBLED_NUM 22
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_KNIGHT
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index 99f8dbd51a4..21d0839542d 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D1"
},
"rgblight": {
+ "led_count": 22,
"split_count": [11, 11]
},
"ws2812": {
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index 34d301311b9..770c20f0194 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -22,7 +22,6 @@
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // limits maximum brightness of LEDs to 100 out of 255.
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGBLED_NUM 110
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index f8e73dccb85..1725018300a 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -24,9 +24,6 @@
#define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 }
#define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 }
-#define RGB_MATRIX_LED_COUNT 21
-#define DRIVER_COUNT 2
-#define RGBLED_NUM 21
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index 9a389686180..98afa6e228e 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -17,6 +17,9 @@
"driver": "custom",
"pin": "F0"
},
+ "rgblight": {
+ "led_count": 21
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h
index b0b9bb6c179..274c715a937 100644
--- a/keyboards/montsinger/rebound/rev4/config.h
+++ b/keyboards/montsinger/rebound/rev4/config.h
@@ -18,6 +18,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 17
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
index 9f4e89497e0..565e56701f9 100644
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ b/keyboards/montsinger/rebound/rev4/info.json
@@ -18,6 +18,9 @@
{"pin_a": "D2", "pin_b": "D3"}
]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index b61be3ea8f5..cfa335c00b7 100644
--- a/keyboards/mt/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
@@ -34,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json
index db328f8dadc..ceb71d1efad 100644
--- a/keyboards/mt/blocked65/info.json
+++ b/keyboards/mt/blocked65/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
index bb901374362..32e880e6a22 100644
--- a/keyboards/mt/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json
index 4d3cab4ebab..f53e9f60d46 100644
--- a/keyboards/mt/mt40/info.json
+++ b/keyboards/mt/mt40/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D2"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 6bb1089509e..c9bd211f1fa 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -90,7 +90,6 @@
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_SAT_STEP 5
#define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index ad62d19acbe..0ba7cff7652 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index ee9ebb08027..dcd6d783f51 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -86,7 +86,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json
index 371ef6bb591..f42d02b0fe8 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index eff34dc5217..401de718c15 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 809474914fe..13ee940f799 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -26,6 +26,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 185
},
"bootmagic": {
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
index 59b05a0f9b9..161525549b2 100644
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -27,7 +27,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 81
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index f02a2f74055..670538a9a1c 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -23,6 +23,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 81,
"max_brightness": 180
},
"processor": "atmega32u4",
diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h
index 35fe9a097f5..688f30a2519 100644
--- a/keyboards/mt/split75/config.h
+++ b/keyboards/mt/split75/config.h
@@ -7,7 +7,6 @@
#define MATRIX_ROWS 8
#define MATRIX_COLS 14
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
index 0ac1bbde8a5..0fe612ebf05 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -12,6 +12,7 @@
"pin": "D4"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index c64507deddd..f5e5dd16ec4 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 4929ca19522..d14ef0fca83 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index c64507deddd..f5e5dd16ec4 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 33b623d1d3e..31a73401373 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
index 2e8b3f3bec2..ed091bc4827 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -18,7 +18,6 @@
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGBLED_NUM 87
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json
index b77bbd8bdfe..6ed32cefe6b 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -21,6 +21,7 @@
"pin": "B1"
},
"rgblight": {
+ "led_count": 87,
"max_brightness": 200
},
"processor": "STM32F103",
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
index f987360d4a4..cf0d26844ef 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 21
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index baa73a6e3bf..fade81d7ef0 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -8,6 +8,9 @@
"pid": "0x6500",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 21
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
index 8c5cad9beff..87659c1f67c 100644
--- a/keyboards/mwstudio/mw660/config.h
+++ b/keyboards/mwstudio/mw660/config.h
@@ -16,9 +16,6 @@
#pragma once
-#define DRIVER_LED_TOTAL 34
-#define RGBLED_NUM 34
-
#define WS2812_PWM_DRIVER PWMD4 // default: PWMD2
#define WS2812_PWM_CHANNEL 3 // default: 2
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
index 5d1edb296f5..fdbd7564a7b 100644
--- a/keyboards/mwstudio/mw660/info.json
+++ b/keyboards/mwstudio/mw660/info.json
@@ -12,6 +12,9 @@
"nkro": true,
"rgblight": true
},
+ "rgblight": {
+ "led_count": 34
+ },
"ws2812": {
"pin": "B8"
},
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index eb28a68faab..9f7ac76614a 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -19,7 +19,6 @@
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 97
-#define RGBLED_NUM 97
#define RGB_MATRIX_KEYPRESSES
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index 2c9c02d0acb..5637110e55c 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -25,6 +25,7 @@
"matrix": [0, 1]
},
"rgblight": {
+ "led_count": 97,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index c05921e372d..7d706246b96 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -19,7 +19,6 @@
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 21
-#define RGBLED_NUM 21
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
#define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index fd286ee5090..535d4e41d56 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 21,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h
index d33ee88ce81..83aa5f99782 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json
index 7828803ae18..ae02495e32f 100644
--- a/keyboards/mxss/info.json
+++ b/keyboards/mxss/info.json
@@ -8,6 +8,9 @@
"pid": "0x5353",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 7240672afe7..89540a7930f 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -22,8 +22,7 @@ along with this program. If not, see .
#ifdef RGB_MATRIX_ENABLE
#define WS2812_SPI SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5
- #define RGBLED_NUM 52
- #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+ #define RGB_MATRIX_LED_COUNT 52
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
#define RGB_MATRIX_DEFAULT_VAL 64
#define RGB_MATRIX_HUE_STEP 10
diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
index 7a5962801c0..fe1acecf248 100644
--- a/keyboards/nacly/splitreus62/config.h
+++ b/keyboards/nacly/splitreus62/config.h
@@ -25,8 +25,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index 775f3c2497c..c4992778890 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index fb5d1cd72ea..0f3e64cc1e8 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -29,7 +29,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index dede656f17a..0844181eecd 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -30,6 +30,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 11,
"max_brightness": 200,
"led_map": [4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5]
},
diff --git a/keyboards/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h
index 167b33c37c3..a15d1b8e555 100644
--- a/keyboards/neokeys/g67/element_hs/config.h
+++ b/keyboards/neokeys/g67/element_hs/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json
index 6079a80b191..be0c281ffdd 100644
--- a/keyboards/neokeys/g67/element_hs/info.json
+++ b/keyboards/neokeys/g67/element_hs/info.json
@@ -17,6 +17,7 @@
"pin": "F0"
},
"rgblight": {
+ "led_count": 77,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
index 747a9ff55bb..0a5632e37b6 100644
--- a/keyboards/neokeys/g67/hotswap/config.h
+++ b/keyboards/neokeys/g67/hotswap/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json
index 7f527e6a5fa..4daca8c0d1c 100644
--- a/keyboards/neokeys/g67/hotswap/info.json
+++ b/keyboards/neokeys/g67/hotswap/info.json
@@ -17,6 +17,7 @@
"pin": "F0"
},
"rgblight": {
+ "led_count": 77,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
index 363f00c636a..0a5632e37b6 100644
--- a/keyboards/neokeys/g67/soldered/config.h
+++ b/keyboards/neokeys/g67/soldered/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json
index 3cf0320a431..006fd7e338e 100644
--- a/keyboards/neokeys/g67/soldered/info.json
+++ b/keyboards/neokeys/g67/soldered/info.json
@@ -22,6 +22,7 @@
"pin": "F0"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index e35f0c4d0a4..7d33c31fbc6 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -38,7 +38,6 @@
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
//rgb light setting
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 3f339ad5548..a6db575ba28 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "F5"
},
+ "rgblight": {
+ "led_count": 68
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 9a4c8240c06..30d0e2567b3 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -38,7 +38,6 @@
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
//rgb light setting
-#define RGBLED_NUM 65
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 770748fa29d..6d6d4347544 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -20,6 +20,7 @@
"pin": "B3"
},
"rgblight": {
+ "led_count": 65,
"max_brightness": 192
},
"processor": "atmega32u4",
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index 18c605eb622..49fbdb31de4 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -28,25 +28,9 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 25 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
-#ifndef IOS_DEVICE_ENABLE
- #if RGBLED_NUM <= 6
- #define RGBLIGHT_LIMIT_VAL 255
- #else
- #define RGBLIGHT_LIMIT_VAL 130
- #endif
- #define RGBLIGHT_VAL_STEP 17
-#else
- #if RGBLED_NUM <= 6
- #define RGBLIGHT_LIMIT_VAL 90
- #else
- #define RGBLIGHT_LIMIT_VAL 45
- #endif
- #define RGBLIGHT_VAL_STEP 4
-#endif
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json
index 2cbb4c117d1..9affddfabb6 100644
--- a/keyboards/newgame40/info.json
+++ b/keyboards/newgame40/info.json
@@ -13,6 +13,9 @@
"rows": ["F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 25
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/newgame40/post_config.h b/keyboards/newgame40/post_config.h
new file mode 100644
index 00000000000..247178beec9
--- /dev/null
+++ b/keyboards/newgame40/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 255
+# else
+# define RGBLIGHT_LIMIT_VAL 130
+# endif
+# define RGBLIGHT_VAL_STEP 17
+#else
+# if RGBLED_NUM <= 6
+# define RGBLIGHT_LIMIT_VAL 90
+# else
+# define RGBLIGHT_LIMIT_VAL 45
+# endif
+# define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index d1703c1c80f..39245e1cf0f 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index 81e21e93771..df81389ac3e 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -18,6 +18,9 @@
{"pin_a": "C7", "pin_b": "C6"}
]
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index edeeabfb62a..39860878c95 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index b8acddfd742..af5688ed793 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -19,6 +19,7 @@
"scroll_lock": "B4"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index 541d2e289e3..3204c5492b6 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json
index e318151c8c8..3c6369c2434 100644
--- a/keyboards/nightly_boards/conde60/info.json
+++ b/keyboards/nightly_boards/conde60/info.json
@@ -13,6 +13,9 @@
"rows": ["B1", "B2", "F0", "F1", "F4"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index a8fe38e2c38..39860878c95 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json
index 7879f0e5cac..93aeb4b6b4d 100644
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 474742b6af1..3a25ad12615 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json
index ec403fb6470..967dd817930 100644
--- a/keyboards/nightly_boards/n40_o/info.json
+++ b/keyboards/nightly_boards/n40_o/info.json
@@ -20,6 +20,9 @@
{"pin_a": "B6", "pin_b": "C6"}
]
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 59922cdcb1f..d9734244549 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
/* Underglow */
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 309b7e29b7e..487fc5457ab 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index de715e0af81..753e947e233 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json
index 5c23018d550..633bd51f944 100644
--- a/keyboards/nightly_boards/n87/info.json
+++ b/keyboards/nightly_boards/n87/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index 569276e7d1b..39860878c95 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json
index aea91641915..1ee9a51fcd0 100644
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index 27c3d4bd024..10aebd0d07a 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index c78a58937d8..6a889bece6a 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -19,6 +19,9 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index f7cdccf510d..6db75f57fe7 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -31,7 +31,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 571471ecc58..8db4be56225 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -20,6 +20,7 @@
"pin": "B3"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h
index de4c80545c7..16f211c2e30 100644
--- a/keyboards/novelkeys/nk1/config.h
+++ b/keyboards/novelkeys/nk1/config.h
@@ -17,7 +17,6 @@
#pragma once
- #define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json
index 3060778e300..ee582b84441 100755
--- a/keyboards/novelkeys/nk1/info.json
+++ b/keyboards/novelkeys/nk1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 23b8d2915a1..55d8b53e83b 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 20
#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 210
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index a22f9b16854..e236351344f 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 68
#define RGB_MATRIX_LED_COUNT 68
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index 49d3104c454..a0bbb315d40 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 87
#define RGB_MATRIX_LED_COUNT 87
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 8678c1ca042..49ab28c713c 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 4
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
index e98746ab299..a7dad329963 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 10
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index 051782f1461..34af3add7d1 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index d1f57bc5fc9..5ad8fca682c 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index 0f7486408c4..5cd505cdfd1 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json
index 1bfcf109f44..d75376b26b0 100644
--- a/keyboards/noxary/x268/info.json
+++ b/keyboards/noxary/x268/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index 2d12e6668ef..d33b8afb5e0 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -39,7 +39,6 @@
#define MATRIX_COL_PINS { }
/* Optional SMT LED pins */
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index 075d0f9a5bd..cc66623b094 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -13,6 +13,7 @@
]
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index 8fe9dc717e6..b3b3bf57b2e 100644
--- a/keyboards/nullbitsco/snap/config.h
+++ b/keyboards/nullbitsco/snap/config.h
@@ -58,7 +58,6 @@
#define MATRIX_EXT_PIN_RIGHT B6
/* Optional SMT LED pins */
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index ee04366ae6e..b16015c123e 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -8,6 +8,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 10,
"sleep": true,
"led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
"split_count": [5, 5]
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 346a8fb8a85..56477ea5c46 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -23,7 +23,6 @@
#define USB_SUSPEND_WAKEUP_DELAY 200
/* Optional SMT LED pins */
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index 0ed0a5e7b85..00e8a9d7df0 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,9 @@
"pid": "0x6064",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
index 774687565a1..640da7ba9c6 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-// keyboard RGB LED support
-// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
-#define RGBLED_NUM 6
-
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json
index 54f5bde1bd9..2166b1308fc 100644
--- a/keyboards/numatreus/info.json
+++ b/keyboards/numatreus/info.json
@@ -17,6 +17,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 200
},
"processor": "atmega32u4",
diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index e584bb045ce..1b6189b42e0 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12
-#endif
-
#define OLED_DISPLAY_128X64
#define EE_HANDS
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index b888049bc51..464cd01be8f 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 12,
"led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
"split_count": [6, 6]
},
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index 3ef7dc1103c..19ff41d44ab 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
index d8fa61179b3..6cb8ae5f2a7 100644
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@@ -12,6 +12,7 @@
"pin": "D4"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index 690b44eb064..facded4a0e1 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index c51af75fe02..1c0346131ba 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 14,
"led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7]
},
"ws2812": {
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index adff7abc3eb..d510497b8e9 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D1
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index 3321f0e1be1..7ef564ba28e 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D3"
},
"rgblight": {
+ "led_count": 14,
"led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
"split_count": [7, 7]
},
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index f11b35919e9..539027c468e 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json
index a9996397399..6a29520abef 100644
--- a/keyboards/ok60/info.json
+++ b/keyboards/ok60/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 5
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
index 885af3328ee..533a851c434 100644
--- a/keyboards/om60/config.h
+++ b/keyboards/om60/config.h
@@ -34,10 +34,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 69
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
index cc34ff7dd2d..7192e8b62f0 100644
--- a/keyboards/om60/info.json
+++ b/keyboards/om60/info.json
@@ -14,6 +14,7 @@
]
},
"rgblight": {
+ "led_count": 69,
"sleep": true,
"led_map": [0, 1, 2, 3, 8, 7, 6, 5, 4, 9, 10, 11, 12, 13, 18, 17, 16, 15, 14, 19, 20, 21, 22, 23, 28, 27, 26, 25, 24, 29, 30, 31, 32, 33, 38, 37, 36, 35, 34, 39, 40, 41, 42, 43, 48, 47, 46, 45, 44, 49, 50, 51, 52, 53, 58, 57, 56, 55, 54, 59, 60, 61, 62, 63, 68, 67, 66, 65, 64]
},
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index 38c62de36a4..0f7df79b277 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
index 169bc9f0c56..45f66b53811 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -21,6 +21,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 20,
"split_count": [10, 10]
},
"ws2812": {
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 11f057d6004..0f7df79b277 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index b73694688cc..25d82553ae8 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/info.json
@@ -21,6 +21,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 24,
"led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
"split_count": [12, 12]
},
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index ee17cb6adfa..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 36
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 7a7141816b9..10af33d9554 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 36,
"max_brightness": 100,
"split_count": [18, 18]
},
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index deed54f177a..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 42
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index d23f6f50989..48fd1bb81f7 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 42,
"max_brightness": 100,
"split_count": [21, 21]
},
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index 29907f0c367..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 48
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index 9f3d4b6bc2e..4c4d227a79c 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 48,
"max_brightness": 100,
"split_count": [24, 24]
},
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index 29907f0c367..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 48
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index a21eb2f4bbe..7d284dead0c 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 48,
"max_brightness": 100,
"split_count": [24, 24]
},
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index cd1964b1358..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 56
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index e3d06566d63..a40442fd579 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 56,
"max_brightness": 100,
"split_count": [28, 28]
},
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index d8ec59f2949..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 64
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index 90b63fb9ff7..e9bedb76a55 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 100,
"split_count": [32, 32]
},
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index c80f743de55..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 60
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index c41074c9c12..67cc3d98abe 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 60,
"max_brightness": 100,
"split_count": [30, 30]
},
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 09c67164d77..e62710264ff 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 70
#endif
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 70
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index 754135e4c31..c4fce3c600e 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -23,6 +23,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 70,
"max_brightness": 100,
"split_count": [30, 40]
},
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index e2b58fb4a09..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 70
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index f27590f4022..579596e8a8c 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 70,
"max_brightness": 100,
"split_count": [35, 35]
},
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index 6b86ad423c0..516c08d0618 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -35,7 +35,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 80
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index ae35f611282..7e35f883a8d 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 80,
"max_brightness": 100,
"split_count": [40, 40]
},
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index e2b275251dd..8ad0b8935f2 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index 7ceeef83124..005c5b6648a 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/info.json
@@ -17,6 +17,9 @@
"pin": "F5",
"levels": 6
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 9a0d961ddd0..d272e9fdd7a 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
- #define RGBLED_NUM 10 /*Change for the number of leds on the strip you attach*/
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 8cba3b15543..16e6158bd5d 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -20,6 +20,7 @@
]
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
index b40244be73d..63b75c2ce99 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ b/keyboards/owlab/jelly_epoch/hotswap/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
index c30c06fb670..c85c31bf0b7 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -14,6 +14,9 @@
"rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
index b40244be73d..63b75c2ce99 100644
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ b/keyboards/owlab/jelly_epoch/soldered/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
index 4c66855d6b7..e7fed3d2853 100644
--- a/keyboards/owlab/jelly_epoch/soldered/info.json
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -14,6 +14,9 @@
"rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index 15d1e18d0b3..591a7e1c2e0 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
index cdf51430618..27bb44672ee 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -14,6 +14,9 @@
"rows": ["B0", "B7", "D0", "D1", "D2"]
},
"diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 17222658f31..1dfd7cbc50b 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 6b6474ab68f..d8601bae00e 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -26,6 +26,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 180
},
"processor": "STM32F303",
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 6f41edccd06..9c1b4bca93e 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 3b38b45da4c..964c3bdcda8 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -26,6 +26,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 180
},
"processor": "STM32F303",
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index a7548280532..cc72fe4c957 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 25
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 4f323df4477..c42cc3dbf48 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -19,6 +19,9 @@
{"pin_a": "F6", "pin_b": "F7", "resolution": 2}
]
},
+ "rgblight": {
+ "led_count": 25
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index edc623d08fa..401de718c15 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json
index 89c96391395..93b5972aa69 100644
--- a/keyboards/panc40/info.json
+++ b/keyboards/panc40/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index d324ea3f813..d849732a072 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 12
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json
index 077949cd095..05793bd412a 100644
--- a/keyboards/panc60/info.json
+++ b/keyboards/panc60/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index 2a51abdab27..d849732a072 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -27,4 +27,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json
index 8ac8ef0a7e4..a56cf0aca2b 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -15,6 +15,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 8ddf2721aeb..c40767ca737 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index fb504008559..37f92422087 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -25,6 +25,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index f0941ad8f62..6d9a8342025 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index f75d96f47ff..d8002310208 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 08478116459..62ae9426273 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index cbc50e62447..149804a2a51 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -20,6 +20,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index 756ca8a096d..b2c0ef05361 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -43,7 +43,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 14d06f6ea50..0dcf6b4c3b7 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -25,6 +25,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index 7acedf70726..bb81c2f295c 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index a1bd1d859aa..f719a8b2a08 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index 3f1a469d746..7cce89aa598 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index d9d6437ea58..76c96503fb6 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index b7aa6ca2e9c..d849732a072 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 2
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index fcbdf6bac88..5cc689c1c2a 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 6907429c391..0f45c7154ee 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 2
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index 19e7f816036..0570481adca 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -17,6 +17,9 @@
"pin": "D4",
"levels": 5
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index 75b78de22de..d849732a072 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json
index 4133d5c81b8..1b868a244f0 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 6e2931a9d64..23a98fa4801 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json
index bf858eaf06b..745c97a2c92 100644
--- a/keyboards/phantom/info.json
+++ b/keyboards/phantom/info.json
@@ -17,6 +17,9 @@
"caps_lock": "B6",
"scroll_lock": "B7"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h
index 7506090b1ed..5a731362867 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json
index c9d61fc4342..841f2f8eb7d 100644
--- a/keyboards/pico/65keys/info.json
+++ b/keyboards/pico/65keys/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h
index 7506090b1ed..5a731362867 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#undef RGBLED_NUM
-#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json
index 09c1cfa5b38..c61bdb06317 100644
--- a/keyboards/pico/70keys/info.json
+++ b/keyboards/pico/70keys/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 1bd318c9ade..c3cd956eee4 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -32,7 +32,6 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 67
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json
index 91aadda6ff4..1ef4dc17bba 100644
--- a/keyboards/picolab/frusta_fundamental/info.json
+++ b/keyboards/picolab/frusta_fundamental/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 67
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
index 2e36c2f7221..231ffbc3925 100644
--- a/keyboards/pimentoso/touhoupad/config.h
+++ b/keyboards/pimentoso/touhoupad/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 83b6899d788..ace9e6a57e4 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h
index c6dd26a46a9..42f560290c2 100644
--- a/keyboards/pixelspace/capsule65i/config.h
+++ b/keyboards/pixelspace/capsule65i/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json
index b2ac8f85287..c7fe995e8fb 100644
--- a/keyboards/pixelspace/capsule65i/info.json
+++ b/keyboards/pixelspace/capsule65i/info.json
@@ -16,6 +16,9 @@
"indicators": {
"caps_lock": "F6"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 3b10a2b753b..1ec2e9febef 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -42,7 +42,6 @@
//#define NO_ACTION_ONESHOT
// #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
// #define WS2812_TIM_N 2
// #define WS2812_TIM_CH 2
// #define PORT_WS2812 GPIOA
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 1d029dae697..c0c8dc2c55e 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -45,8 +45,7 @@
/*
* WS2812 Underglow Matrix options
*/
-#define RGBLED_NUM 9
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index c1e4e527cee..ac0691721c7 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -8,6 +8,9 @@
"pid": "0xA4F9",
"device_version": "0.0.6"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index ff15e9628d2..7050fa009c2 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -46,8 +46,7 @@
/*
* WS2812 Underglow Matrix options
*/
-#define RGBLED_NUM 9
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index 00f1fab14ee..c5450f45c01 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -8,6 +8,9 @@
"pid": "0xA4F9",
"device_version": "0.0.6"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 9bcb20ae881..401de718c15 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 828d5337b2a..8b4449d922c 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "F0"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index 1e2d9099ab4..84d00e498fb 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 87
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index d9f2c7d2fd4..3b68bcc16c3 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -22,6 +22,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 87,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 8471167fcd9..401de718c15 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index 89b414d08f6..71e55fc42c6 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 5
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 9206b74150e..da45375e7ad 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -49,7 +49,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
// # define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 5
# define RGBLIGHT_SAT_STEP 5
# define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 9ac09639fa9..4d557b4c7cc 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -17,6 +17,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 62ed32840bc..b774237b032 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -28,7 +28,6 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index b89f82a363d..ad41e9ef872 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -16,6 +16,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 4,
"max_brightness": 40
},
"processor": "atmega32u4",
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index e59c0a3e853..33f5b870c00 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -23,7 +23,6 @@
#define UNUSABLE_PINS \
{ D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
-#define RGBLED_NUM 3
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
index c7506f2d84d..3588628d875 100644
--- a/keyboards/ploopyco/trackball/rev1_005/info.json
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -10,6 +10,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 3,
"max_brightness": 40
}
}
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index 051c285f894..14a97dd48a7 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 10
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json
index 3f38c555e19..aaad8204270 100644
--- a/keyboards/plume/plume65/info.json
+++ b/keyboards/plume/plume65/info.json
@@ -8,6 +8,9 @@
"pid": "0x22CF",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index f9b4f5c97b4..ca52aace3d5 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
/*
* RGB Underglow
*/
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json
index 280ad0de34d..9b44dd227ce 100644
--- a/keyboards/plut0nium/0x3e/info.json
+++ b/keyboards/plut0nium/0x3e/info.json
@@ -22,6 +22,7 @@
"pin": "C7"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 0fd3723e531..4c5383a41ae 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 8
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
index 0804c27c1c7..adb2f528e6f 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/info.json
@@ -8,6 +8,9 @@
"pid": "0x7901",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index 842ad09c887..f7ad177e456 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 14
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json
index 39674dc1ba0..b7bebe7f582 100644
--- a/keyboards/pohjolaworks/louhi/info.json
+++ b/keyboards/pohjolaworks/louhi/info.json
@@ -22,6 +22,7 @@
"pin": "B5"
},
"rgblight": {
+ "led_count": 14,
"max_brightness": 230
},
"processor": "atmega32u4",
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 515793d1fbe..b6e1595e300 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 95
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index b134de22a51..26088d26170 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -20,6 +20,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 95,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index c7bfeda9a84..b6e1595e300 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 125
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 6765a6ccc0e..cb0a452818e 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 125,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h
index f14e8ae3521..c3d0a83f2ff 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json
index 5c948df06dc..5a8b431493a 100644
--- a/keyboards/polycarbdiet/s20/info.json
+++ b/keyboards/polycarbdiet/s20/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index fd918c75e5f..ea423cddb31 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* RGB Configs */
- #define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index fd896bf5507..724f8ff4ec3 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 2f55894ae65..53e72073b51 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -45,7 +45,6 @@
/*
* WS2812 Underglow Matrix options
*/
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -57,7 +56,7 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
// RGB Matrix support
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index d6d494e005c..3d6257d46cd 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -6,6 +6,9 @@
"pid": "0xA649",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index ac584dfbfe4..fa7b87b7cdc 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -45,7 +45,6 @@
/*
* WS2812 Underglow Matrix options
*/
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -58,7 +57,7 @@
#define RGBLIGHT_EFFECT_TWINKLE
// RGB Matrix support
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index a3eac4eaf40..05a27241693 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -6,6 +6,9 @@
"pid": "0xA649",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h
index 0633f8948ef..3bb4f22006d 100644
--- a/keyboards/primekb/meridian/config.h
+++ b/keyboards/primekb/meridian/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 3
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h
index e28306587db..3da9ff72c42 100644
--- a/keyboards/primekb/meridian/ktr1010/config.h
+++ b/keyboards/primekb/meridian/ktr1010/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 3
// Special timing definitions for KTR101
#define WS2812_TIMING 1325
#define WS2812_T0H 350
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/info.json
index 3a330b7306e..a9a9362ec98 100644
--- a/keyboards/primekb/meridian/ktr1010/info.json
+++ b/keyboards/primekb/meridian/ktr1010/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B15"
}
diff --git a/keyboards/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h
index 0633f8948ef..3bb4f22006d 100644
--- a/keyboards/primekb/meridian/ws2812/config.h
+++ b/keyboards/primekb/meridian/ws2812/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 3
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/info.json
index 98702321171..4299d367c20 100644
--- a/keyboards/primekb/meridian/ws2812/info.json
+++ b/keyboards/primekb/meridian/ws2812/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h
index 6e481d7778e..6003927d20d 100644
--- a/keyboards/primekb/meridian_rgb/config.h
+++ b/keyboards/primekb/meridian_rgb/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 64
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json
index c967c15811f..dca8ceb8bc1 100644
--- a/keyboards/primekb/meridian_rgb/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -22,6 +22,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 200
},
"processor": "atmega32u4",
diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h
index 6610d03f046..21388d69a2d 100644
--- a/keyboards/primekb/prime_e/rgb/config.h
+++ b/keyboards/primekb/prime_e/rgb/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json
index 189e448ed93..5a65a70359b 100644
--- a/keyboards/primekb/prime_e/rgb/info.json
+++ b/keyboards/primekb/prime_e/rgb/info.json
@@ -4,6 +4,9 @@
"pid": "0x0052",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B7"
}
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index f8114cd9149..a93d3423630 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/*RGB*/
- #define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json
index 4828c997bae..253455f3e98 100644
--- a/keyboards/program_yoink/ortho/info.json
+++ b/keyboards/program_yoink/ortho/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json
index 112f10c62a1..7e0a0b5ddea 100644
--- a/keyboards/program_yoink/staggered/info.json
+++ b/keyboards/program_yoink/staggered/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index bcb9ffbb09d..7e8be8b7f80 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
index 4ed9926907e..05647155476 100644
--- a/keyboards/projectkb/alice/rev1/info.json
+++ b/keyboards/projectkb/alice/rev1/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 95f845c9313..848c0102c2f 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
index 57113b1e3cd..6a7046652ce 100644
--- a/keyboards/projectkb/alice/rev2/info.json
+++ b/keyboards/projectkb/alice/rev2/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h
index 46f96e7934c..e0f9734fb95 100644
--- a/keyboards/protozoa/p01/config.h
+++ b/keyboards/protozoa/p01/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
#define WS2812_DMA_CHANNEL 5
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
index 94089a3b78d..47616f1452f 100644
--- a/keyboards/protozoa/p01/info.json
+++ b/keyboards/protozoa/p01/info.json
@@ -8,6 +8,9 @@
"pid": "0x5031",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "A9",
"driver": "pwm"
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index d661f794cc4..1148463200f 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -40,6 +40,3 @@ along with this program. If not, see .
// for via
#define DYNAMIC_KEYMAP_LAYER_COUNT 7
-
-//RGB Underglow
-#define RGBLED_NUM 10
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index bb5a8ee1eb4..418ca0f6b8a 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -28,6 +28,9 @@
}
}
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 6603c0e1539..02bd670f713 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -18,7 +18,4 @@
#define LOCKING_SUPPORT_ENABLE
-#define RGBLED_NUM 4
-
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 635c66db992..45cdb5870ac 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -19,6 +19,9 @@
{"pin_a": "C7", "pin_b": "F7", "resolution": 3}
]
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index a23a8173eb3..6d907961df4 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 95b8ff40266..a2ac6f6aed1 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -21,6 +21,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 220,
"sleep": true
},
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index 993304c0367..d50067ed98c 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -47,7 +47,6 @@
#endif
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 47
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 1e3bf7a5e71..973ea332edb 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 47,
"max_brightness": 130,
"sleep": true
},
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index 92936268eeb..88cc0d4255f 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,7 +14,6 @@
#pragma once
-#define RGBLED_NUM 80
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index 24196d909cb..d0287ab275c 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -16,6 +16,7 @@
"pin": "D6"
},
"rgblight": {
+ "led_count": 80,
"max_brightness": 140,
"sleep": true
},
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index c4c8f31188e..16531d3979f 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,7 +14,6 @@
#pragma once
-#define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index 6881d0824fb..0d1aeb23286 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -16,6 +16,7 @@
"pin": "D6"
},
"rgblight": {
+ "led_count": 77,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index 54b3021a264..88cc0d4255f 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,7 +14,6 @@
#pragma once
-#define RGBLED_NUM 77
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index 4390e557b15..ab4b9562cf7 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -16,6 +16,7 @@
"pin": "F0"
},
"rgblight": {
+ "led_count": 77,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index 5cb4154ec38..75f48fd8b2d 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,7 +14,6 @@
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index c8fae559d12..f711400f765 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -16,6 +16,7 @@
"pin": "F0"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index e266f72ad5b..019af525f57 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index fa8b71b5d6d..57669dfa996 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -23,6 +23,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 4,
"max_brightness": 240
},
"processor": "atmega32u4",
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index a2236d27194..ec671f32564 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index f52ebdecc9e..817cc3937b7 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -14,6 +14,7 @@
"rows": ["B6", "B2", "B3", "B1"]
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 3f9d574f77e..b7fbc577a24 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -31,7 +31,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index 891c4847785..f951a12ae0d 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -8,6 +8,9 @@
"pid": "0x645C",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 5033c1ceac1..b7fbc577a24 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -31,7 +31,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
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index c1c874c77bc..a3ecbfc5576 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -8,6 +8,9 @@
"pid": "0x7973",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index f0e2a2474be..e09993bbd3f 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index db0689501cf..e1a7948f0b2 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 7,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 402c7ba0f21..e09993bbd3f 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index ce5b452fb65..51990a82986 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -12,6 +12,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 11,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index 5fa91c7de4c..b87572e02dd 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -29,8 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-/* You can change the number of RGB strip */
-#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 78e9b339917..f582a9c4c7f 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -26,6 +26,7 @@
"pin": "C0"
},
"rgblight": {
+ "led_count": 11,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index 115b0cdd261..b87572e02dd 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -29,8 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-/* You can change the number of RGB strip */
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 649858d80e4..1fd5ce655ed 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -21,6 +21,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index b242e63013b..f5b050fa4e2 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 11
#define WS2812_SPI SPID2
/*
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index b1046227cc5..56266f38454 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -19,6 +19,9 @@
"scroll_lock": "A9",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 11
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 4fcac94312f..e09993bbd3f 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index a1a5e6ca9a7..ae075ae34dc 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -26,6 +26,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 5,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index 1e44c5d8090..9f66603c8c5 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -19,8 +19,6 @@ along with this program. If not, see .
#define USE_I2C
-/* ws2812 RGB LED */
-#define RGBLED_NUM 2
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
index 60b907c809b..96668c03a46 100644
--- a/keyboards/rate/pistachio/rev1/info.json
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -1,5 +1,6 @@
{
"rgblight": {
+ "led_count": 2,
"split_count": [1, 1]
},
"ws2812": {
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 2852508d9ef..91e26ec6563 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Split hand configration */
#define SPLIT_HAND_MATRIX_GRID D4,D3
-/* ws2812 RGB LED */
-#define RGBLED_NUM 84
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
index cf2c1db741b..1aa2b97e424 100644
--- a/keyboards/rate/pistachio/rev2/info.json
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -3,6 +3,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 84,
"max_brightness": 195,
"split_count": [38, 46]
},
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 25aac817da7..1228e277052 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index 07943e5ca32..5dc54182aeb 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
index 17ec1a2babc..b6fd6835f35 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define RGBLED_NUM 18
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
index c9fb81dad88..ed50bb852cd 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h
index c3f781ab7c5..7de6a86e4f8 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_solder/rev_a/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define RGBLED_NUM 18
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json
index a35fb509720..a789d1b2295 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json
@@ -8,6 +8,9 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 1764902c417..1af9965baad 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index 2fa1cd9f14b..94a7632fc36 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
index 6fb0d430fbc..4697a6ecd93 100644
--- a/keyboards/rect44/config.h
+++ b/keyboards/rect44/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 12
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index bf985f6202f..efa82165ac5 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -8,6 +8,9 @@
"pid": "0x4DD7",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index 56ea22e3294..fdda27552df 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 14 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json
index 9e50ca5baa4..c0c5ce6e1a6 100644
--- a/keyboards/redox/rev1/info.json
+++ b/keyboards/redox/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "1.0.0"
},
"rgblight": {
+ "led_count": 14,
"split": true
},
"layouts": {
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index 5652d5718fc..c5a4318594c 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json
index 1b15ca5e805..f9ec25d6717 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -8,6 +8,9 @@
"pid": "0x5275",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "A9"
},
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index a730f35d8c6..9fa20a136cf 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index 3b56eb8c536..16949f01575 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -8,6 +8,9 @@
"pid": "0x4450",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 30335eda520..39fee7eac53 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
# define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index 143fe24c13e..6fa0fada870 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 91078ecd256..2cdea0acbde 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index 5ce3ea19a59..5226336a04b 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 11,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index 8d934c9214b..d412d687acd 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
# define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index c5e64d49d17..015438ededc 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index ff55a4662f6..eed02fe4775 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index 4eb6e9e67b0..255b6a441cf 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index b5b7c0ce95c..8e84cca0f7d 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -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
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 3bf22fa6562..865ff816e54 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 98,
"split_count": [49, 49]
},
"ws2812": {
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index b89b6b4f658..242e397db48 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#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 .
#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:
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index 5c3ed6f6101..1f408bd7135 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -12,6 +12,7 @@
"driver": "custom"
},
"rgblight": {
+ "led_count": 64,
"max_brightness": 120
},
"layouts": {
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index bce51e7fcc0..14dc56b121b 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -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
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 192760068d0..6db25dab194 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 156,
"split_count": [78, 78]
},
"ws2812": {
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 88951a1b449..1578432cf80 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* 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.
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 940df081c96..81370b916dd 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 394fd1630bc..6f706c197ba 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see .
/* 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
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index eed39e56287..c2c4e52ec64 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -21,6 +21,9 @@
"split": {
"soft_serial_pin": "D3"
},
+ "rgblight": {
+ "led_count": 34
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h
index b4efbc241c7..4184f7de3f3 100644
--- a/keyboards/rmi_kb/squishy65/config.h
+++ b/keyboards/rmi_kb/squishy65/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json
index 35aeac5706f..d94f8ef40ef 100644
--- a/keyboards/rmi_kb/squishy65/info.json
+++ b/keyboards/rmi_kb/squishy65/info.json
@@ -8,6 +8,9 @@
"pid": "0x10B5",
"device_version": "0.6.5"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index 2752477d46e..a10887284c3 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
index f6ab10f5d93..4ec0c9243d9 100644
--- a/keyboards/rmi_kb/squishyfrl/info.json
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -8,6 +8,9 @@
"pid": "0x4BE5",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "C15"
},
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 2752477d46e..a10887284c3 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index b49d72c8293..bfa51fa28c3 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,9 @@
"pid": "0x00B1",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "C15"
},
diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h
index abca542be3f..b67e386f734 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/config.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/config.h
@@ -19,7 +19,6 @@
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-# define RGBLED_NUM 26
# define RGBLIGHT_HUE_STEP 32
# define RGBLIGHT_SAT_STEP 32
# define RGBLIGHT_VAL_STEP 32
diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json
index a7617b5f30e..2d5f4073464 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/info.json
+++ b/keyboards/rmi_kb/tkl_ff/v2/info.json
@@ -2,6 +2,9 @@
"usb": {
"pid": "0x10FF"
},
+ "rgblight": {
+ "led_count": 26
+ },
"ws2812": {
"pin": "E2"
}
diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index c4d0637afe2..b45bf03be5e 100644
--- a/keyboards/rmi_kb/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index c3ae142d319..df88e509b0c 100644
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -18,6 +18,9 @@
"levels": 24,
"breathing": true
},
+ "rgblight": {
+ "led_count": 24
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index cba69b35c9c..e127a00f75c 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 32
# define RGBLIGHT_SAT_STEP 32
# define RGBLIGHT_VAL_STEP 32
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index f1e87a6e287..b809a6bbca6 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -18,6 +18,9 @@
{"pin_a": "D2", "pin_b": "D1"}
]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index 54e5a91dcdf..3844e57ee07 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
#define RGBLIGHT_VAL_STEP 8
// OLED stuff
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index b8eb5201250..78ee3d52c2a 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -25,6 +25,7 @@
"matrix": [4, 1]
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index c34bb7b345f..ef7f54ba522 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
index e0d553071c0..6b4f3034dc3 100644
--- a/keyboards/runes/vaengr/info.json
+++ b/keyboards/runes/vaengr/info.json
@@ -10,6 +10,7 @@
"force_nkro": true
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 95d89c62d95..d4259c9fcf9 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/rev1/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define MASTER_LEFT
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 66 // Number of LEDs
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index fb093b9d4ec..f3ba680d7d3 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 66,
"max_brightness": 120,
"split_count": [33, 33]
},
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 835872aed57..e38f0dc8626 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 3
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 2ee09674860..72135377e27 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -8,6 +8,9 @@
"pid": "0x0018",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 3
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 5614dfa1005..e9ff04496c5 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index 0b514a46f67..df70946f87d 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -8,6 +8,9 @@
"pid": "0x0069",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
index ca1f8284c52..e38f0dc8626 100644
--- a/keyboards/ryanbaekr/rb87/config.h
+++ b/keyboards/ryanbaekr/rb87/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 15
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json
index 8741408aaa1..1f9b51221e0 100644
--- a/keyboards/ryanbaekr/rb87/info.json
+++ b/keyboards/ryanbaekr/rb87/info.json
@@ -10,6 +10,9 @@
"pid": "0x0087",
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index 9ed41827d0c..aa069d3a026 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
# 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
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index cded8206f4a..3c04c5d096b 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 123
},
"processor": "atmega32u4",
diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
index b42ece99a60..7fedf4dce12 100644
--- a/keyboards/saevus/cor_tkl/config.h
+++ b/keyboards/saevus/cor_tkl/config.h
@@ -20,5 +20,4 @@ along with this program. If not, see .
/* 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
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index 5e29165b82a..62e64892131 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -25,10 +25,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 12
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index e195344ed11..db6fc585610 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 1267b547c55..09822bfa88c 100644
--- a/keyboards/salicylic_acid3/7splus/config.h
+++ b/keyboards/salicylic_acid3/7splus/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 31
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index fa9c166ada8..34ab093af01 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 31,
"split_count": [11, 20]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
index 17976de2300..c08c9612efa 100644
--- a/keyboards/salicylic_acid3/ergoarrows/config.h
+++ b/keyboards/salicylic_acid3/ergoarrows/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 86
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index b058a5367d1..b352eb47c7f 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 86,
"split_count": [43, 43]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index cdc803a98c6..eb0a745116d 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 9 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index de9fe887e76..09eb5a8388e 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x3060",
"device_version": "0.1.3"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index 06f8e5664e2..eb9b97288de 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 32
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index bc2759751ed..2a4a51938fc 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 32,
"split_count": [11, 21]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
index 94d44bfce83..5ff58589339 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index ea2645cf23f..a72cf38e7f1 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,6 +8,9 @@
"pid": "0x3060",
"device_version": "0.1.2"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index c7246fad769..d185624ef9b 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -22,10 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 48
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index a378952d252..43d980508fe 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -25,6 +25,9 @@
}
}
},
+ "rgblight": {
+ "led_count": 48
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
index 1cf00110ac5..b14abaf8e6c 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/config.h
@@ -23,8 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
-
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index cb9a7b341f1..ec96590522d 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -23,6 +23,7 @@
}
},
"rgblight": {
+ "led_count": 12,
"led_map": [0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
index c6a70946b32..20af4222027 100644
--- a/keyboards/salicylic_acid3/nknl7en/config.h
+++ b/keyboards/salicylic_acid3/nknl7en/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 21
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index db2460d28ab..f1f7ee2d46f 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 21,
"split_count": [9, 12]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 0d465f97a2c..20af4222027 100644
--- a/keyboards/salicylic_acid3/nknl7jp/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifndef RGBLED_NUM
- #define RGBLED_NUM 20
-#endif
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index bcbabe051d8..4cda99931e8 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 20,
"split_count": [9, 11]
},
"ws2812": {
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index eb9e0b5b1dc..5ff58589339 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 21 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index 642bde6298a..9027068cd8c 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x3060",
"device_version": "0.1.1"
},
+ "rgblight": {
+ "led_count": 21
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 94d716028ae..f8ffe4cf437 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -16,7 +16,6 @@
#pragma once
-# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index 73794ba3eb9..50bcd2c6f84 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -20,6 +20,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 100
},
"processor": "atmega32u4",
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 97e618fc20d..28d76aab24d 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 22cc79a48a8..95384847f4a 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -17,6 +17,7 @@
"caps_lock": "B0"
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index b73345c48f6..9cdbac5812d 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB */
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index d786ecf833c..7efd74a2fdb 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -19,6 +19,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 22,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index ec085f23e41..ff4f333a82b 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index f0ceb084cca..10393dbeffe 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -21,6 +21,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index c6aa467de44..e5700d1b291 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -22,7 +22,6 @@
#define ENCODERS_CCW_KEY { { 12, 4 } }
/* RGB */
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index e4dadab791d..07506d85bf1 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -26,6 +26,7 @@
"pin": "E6"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index c6c5be19624..db211f5b848 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 596605c37f3..b6360120982 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -26,6 +26,7 @@
"pin": "F1"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index e87262b68ea..faf80f1df52 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 1a933245b6f..9dcbfb3d3ef 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index 21a8755b575..4dda913d3dd 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index b9ece7c67fc..0b046df999d 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -21,6 +21,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index c95d84b30d0..9ae2a01bd57 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -18,5 +18,4 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 4
#endif
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 422fb0c0f1e..3fc2bcc54d5 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,9 @@
"pid": "0x6090",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 5d40fc0e01c..ac82fb4eb00 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index 5c9ca25a8fc..2cbf7af6524 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -19,6 +19,7 @@
"scroll_lock": "B6"
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 3b4ba31700f..b574747a53d 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -25,7 +25,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 15
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json
index 6c6ef95912d..f3e8103ddeb 100644
--- a/keyboards/sendyyeah/pix/info.json
+++ b/keyboards/sendyyeah/pix/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 15,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index cd09a4f3166..7f1195b18c2 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
/* RGB Backlighting */
-#define RGBLED_NUM 69
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index 662b73fc17b..3653aaf82ef 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -12,6 +12,7 @@
"pin": "B1"
},
"rgblight": {
+ "led_count": 69,
"max_brightness": 122,
"sleep": true
},
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 176505a8e57..38391089fc9 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
/* RGB Backlighting */
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
index ee4dbad5e66..ca23cd1a832 100644
--- a/keyboards/senselessclay/gos65/info.json
+++ b/keyboards/senselessclay/gos65/info.json
@@ -12,6 +12,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 125,
"sleep": true
},
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index 1ec9ac0afd5..0addea97935 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 47ef2185a0f..d0958681bbd 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -8,6 +8,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 13,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index da4d3257a62..401de718c15 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -16,7 +16,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
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index c311c6a5134..bfe0b12bbb2 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -9,6 +9,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 900ea0aa40a..477128c3045 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -10,7 +10,6 @@
#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
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index f9287f2507f..a50127f7612 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index 900ea0aa40a..477128c3045 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -10,7 +10,6 @@
#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
diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index 34af6ac3dc0..80266277ebe 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -19,6 +19,7 @@
"as_caps_lock": true
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index bff26cfc80b..cb1a301ae68 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 102
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
@@ -41,6 +40,6 @@
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 102
#define RGB_MATRIX_KEYPRESSES
#endif
diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index f59f186bf4c..ffe11345142 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -12,6 +12,7 @@
"pin": "B7"
},
"rgblight": {
+ "led_count": 102,
"max_brightness": 230
},
"matrix_pins": {
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 4ac6c7b5310..437b5d9b370 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define MASTER_RIGHT
- #define RGBLED_NUM 52
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 52
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 4146b4feeed..778d7228741 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -15,6 +15,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 52,
"max_brightness": 150,
"led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
"split_count": [26, 26]
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 75b78de22de..d849732a072 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json
index 4c582df8584..e2441b48e54 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 9b10186c491..c45c42df7aa 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index d10022a48b7..aedf688c447 100644
--- a/keyboards/skeletn87/hotswap/info.json
+++ b/keyboards/skeletn87/hotswap/info.json
@@ -26,6 +26,7 @@
"pin": "B3"
},
"rgblight": {
+ "led_count": 10,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 9b10186c491..c45c42df7aa 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index a4dd4f18f73..12304381914 100644
--- a/keyboards/skeletn87/soldered/info.json
+++ b/keyboards/skeletn87/soldered/info.json
@@ -26,6 +26,7 @@
"pin": "B2"
},
"rgblight": {
+ "led_count": 10,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 521df97db71..0682aa94b05 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index f51577a47ac..7b93a11323a 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -12,6 +12,7 @@
"pin": "D4"
},
"rgblight": {
+ "led_count": 17,
"max_brightness": 120,
"sleep": true
},
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 5932113c947..e83868463af 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index ca86bae4b98..cf059280582 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -12,6 +12,7 @@
"pin": "F7"
},
"rgblight": {
+ "led_count": 68,
"max_brightness": 96
},
"matrix_pins": {
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 31f83e7d35d..c97f2a22df8 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 21
-
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
index 0dcd3b5cbe4..dd4ff8c1bbc 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 21,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h
index 9d7338ccce9..6e0360ec7b3 100644
--- a/keyboards/skmt/15k/config.h
+++ b/keyboards/skmt/15k/config.h
@@ -19,7 +19,6 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 15 // Number of LEDs
#define RGB_MATRIX_LED_COUNT 15 // Number of LEDs
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h
index 9f86b9e55c7..67cbf311ae3 100644
--- a/keyboards/smithrune/iron165r2/f072/config.h
+++ b/keyboards/smithrune/iron165r2/f072/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-#define RGBLED_NUM 22
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
index 8ced3df7758..9e980a15b98 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/info.json
@@ -4,6 +4,9 @@
"levels": 20,
"breathing": true
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index fa904fdabb9..5ce500d1e59 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 2
-#define RGBLED_NUM 22
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
index 7fd45874f22..220cc4d019a 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/info.json
@@ -4,6 +4,9 @@
"levels": 20,
"breathing": true
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "B15",
"driver": "pwm"
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index 9cc3f8601e0..98fe61d1245 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -21,7 +21,6 @@
//#define NO_ACTION_ONESHOT
//rgb light setting
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json
index f80f3f260b3..7dc1cda0dbe 100644
--- a/keyboards/smk60/info.json
+++ b/keyboards/smk60/info.json
@@ -8,6 +8,9 @@
"pid": "0x6585",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index ceccc0915b8..c671886e797 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index e16645e7358..b5398e46dc2 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -26,6 +26,9 @@
"bootmagic": {
"matrix": [2, 0]
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index a97d34f7f26..78ebef5b302 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
\ No newline at end of file
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 693794e0310..c25da340e65 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -22,6 +22,9 @@
"caps_lock": "D6",
"num_lock": "D4"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 9d07bd0dce4..1ab44f422c4 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -48,7 +48,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 71ee91e6604..fd9889acdb0 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,9 @@
"pid": "0xEB52",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "A13"
},
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c931962b39b..9f82ce80ec7 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -31,7 +31,6 @@
// Add RGB underglow
// by defining in the keyboard, incompatible keymaps will fail to compile.
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 74
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index 58fdb109121..7807a546c31 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -10,6 +10,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 74,
"max_brightness": 100,
"led_map": [28, 16, 4, 1, 13, 25, 10, 36, 35, 34, 33, 32, 31, 30, 29, 27, 26, 24, 23, 22, 21, 20, 19, 18, 17, 15, 14, 12, 11, 9, 8, 7, 6, 5, 3, 2, 0, 45, 57, 69, 72, 60, 48, 63, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, 61, 62, 64, 65, 66, 67, 68, 70, 71, 73],
"sleep": true,
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 04b1fced2b6..0836a67e880 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -19,8 +19,7 @@
#pragma once
#define RGB_MATRIX_KEYPRESSES
-#define RGBLED_NUM 68
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 68
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 08c01e662da..4b1538b6450 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -19,8 +19,7 @@
#pragma once
#define RGB_MATRIX_KEYPRESSES
-#define RGBLED_NUM 87
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 87
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 9d044bb4c52..e30f54c02dc 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see .
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
- #define RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index aa5dbc1873a..68c8ec17636 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -8,6 +8,9 @@
"pid": "0x5337",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index f0538478228..15972c8d772 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
index 2e1165a8107..470ac8db6ba 100755
--- a/keyboards/spaceholdings/nebula68/info.json
+++ b/keyboards/spaceholdings/nebula68/info.json
@@ -13,6 +13,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 10,
"max_brightness": 210
},
"matrix_pins": {
diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
deleted file mode 100644
index 6a3ec9c5c13..00000000000
--- a/keyboards/spaceman/2_milk/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 333bad3b87e..a703c8f8903 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -8,6 +8,9 @@
"pid": "0x3225",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index 2e19c5d438a..1356c62ea17 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 68
# define RGB_MATRIX_SPLIT { 34, 34 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index 5f58760e6a0..a3b2cc893e1 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 46
# define RGB_MATRIX_SPLIT { 23, 23 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 4ee4e6ae617..6c21b12a849 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -41,8 +41,6 @@ along with this program. If not, see .
# define SOFT_SERIAL_PIN D2
#endif
-#define RGBLED_NUM 20
-
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
@@ -51,7 +49,7 @@ along with this program. If not, see .
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 970f759d232..089ce402164 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -5,6 +5,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 20,
"split_count": [10, 10]
},
"rgb_matrix": {
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 2b05499965b..198688772be 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -47,8 +47,6 @@ along with this program. If not, see .
# define SOFT_SERIAL_PIN D2
#endif
-#define RGBLED_NUM 20
-
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
@@ -57,7 +55,7 @@ along with this program. If not, see .
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index d37794164a2..95910a2651e 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -5,6 +5,7 @@
"device_version": "0.0.2"
},
"rgblight": {
+ "led_count": 20,
"split_count": [10, 10]
},
"rgb_matrix": {
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index ca97f11eeaf..5168e8678e5 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 62
# define RGB_MATRIX_SPLIT { 31, 31 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index e4d400198c6..0f6fbbb8f42 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define AUDIO_CLICKY
#define NO_MUSIC_MODE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 54de6da046b..6fabc14745a 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index e686b9c6bdb..20708ca9910 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -19,7 +19,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 1
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index c6368ca5682..3fc40e68184 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -12,6 +12,7 @@
"pin": "B3"
},
"rgblight": {
+ "led_count": 1,
"max_brightness": 180
},
"matrix_pins": {
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index 5454be61dbc..1cbcf4c9393 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -3,7 +3,6 @@
#pragma once
-# define RGBLED_NUM 4
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json
index 5b426cfa090..b1dd258e631 100644
--- a/keyboards/stello65/hs_rev1/info.json
+++ b/keyboards/stello65/hs_rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index 5454be61dbc..1cbcf4c9393 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -3,7 +3,6 @@
#pragma once
-# define RGBLED_NUM 4
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json
index 36ae9191716..f58c86d9ae5 100644
--- a/keyboards/stello65/sl_rev1/info.json
+++ b/keyboards/stello65/sl_rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
index 86b8e3a09e0..c87b8d1624d 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* RGB LEDs */
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json
index 51b2132cc20..2cdf427426e 100644
--- a/keyboards/stratos/info.json
+++ b/keyboards/stratos/info.json
@@ -12,6 +12,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 14,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 52f80cf97b3..1d0c2f5567d 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index be8ec45d850..95e6ca69542 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 24,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index e7f86c43e07..d68859814a5 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index e4cfff1e3eb..550084396c3 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h
index 4cf30b8a6b9..bd02bc17c39 100644
--- a/keyboards/studiokestra/frl84/config.h
+++ b/keyboards/studiokestra/frl84/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json
index 3db68f99b4c..04e00b7b463 100644
--- a/keyboards/studiokestra/frl84/info.json
+++ b/keyboards/studiokestra/frl84/info.json
@@ -21,6 +21,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h
index e50d693f8c2..93783c98588 100644
--- a/keyboards/studiokestra/galatea/rev2/config.h
+++ b/keyboards/studiokestra/galatea/rev2/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index 7e6c963a24c..87cff34833f 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -33,6 +33,7 @@
"pin": "D4"
},
"rgblight": {
+ "led_count": 24,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index b737022959d..9601386d136 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index 57ce8bd79e4..ad243e8208e 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -21,6 +21,9 @@
"bootmagic": {
"matrix": [1, 0]
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 790d70d9c81..0019dc79e9b 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -21,7 +21,6 @@
#define MATRIX_ROWS 5
#define MATRIX_COLS 19
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json
index 245b3ab02a7..4c0764bb877 100644
--- a/keyboards/switchplate/southpaw_65/info.json
+++ b/keyboards/switchplate/southpaw_65/info.json
@@ -12,6 +12,9 @@
"pin": "B5",
"levels": 10
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index 4206ba2a501..e4e9ec843db 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json
index 81588a97d0f..035bc526457 100644
--- a/keyboards/takashicompany/center_enter/info.json
+++ b/keyboards/takashicompany/center_enter/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index be126f0e89f..5ef1b7acfa0 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index dbc317b38d6..bad603b549c 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true,
"split_count": [6, 6]
},
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index 84b6a7ea3ea..781f473c633 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json
index 0daedc5dfb5..449ffb15ec2 100644
--- a/keyboards/takashicompany/endzone34/info.json
+++ b/keyboards/takashicompany/endzone34/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 33bc59a0b1b..68ae2c86a17 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 6 * 2
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index 59d98aeb861..670b04984b9 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true,
"split_count": [6, 6]
},
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 72d6aca0537..a7619094b24 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -3,7 +3,6 @@
#pragma once
-# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 8d15687ab53..34c5529f808 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 11,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 4206ba2a501..e4e9ec843db 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json
index 03591022fc2..c89c96541c4 100644
--- a/keyboards/takashicompany/qoolee/info.json
+++ b/keyboards/takashicompany/qoolee/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 6,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index be126f0e89f..5ef1b7acfa0 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json
index 7aac01a959e..194130c4e0e 100644
--- a/keyboards/takashicompany/radialex/info.json
+++ b/keyboards/takashicompany/radialex/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index 6a564c2da2b..df9febfc3d5 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
//#define USE_I2C
- #define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
index b5d4b62bdb3..a5f863b1c3a 100644
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ b/keyboards/takashiski/hecomi/alpha/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D1"
},
"rgblight": {
+ "led_count": 16,
"split_count": [8, 8]
},
"ws2812": {
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index c4a349580c6..bf14602a6c3 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json
index 28781bcd0a6..de7fc7f8ef6 100644
--- a/keyboards/takashiski/namecard2x4/rev1/info.json
+++ b/keyboards/takashiski/namecard2x4/rev1/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index f90b4e073c8..bf14602a6c3 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json
index 51fe26c555c..65434025603 100644
--- a/keyboards/takashiski/namecard2x4/rev2/info.json
+++ b/keyboards/takashiski/namecard2x4/rev2/info.json
@@ -1,4 +1,7 @@
{
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index 44e2a311013..f3f5a9c35fe 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -32,7 +32,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json
index 64eaee77845..275f9d6efe0 100644
--- a/keyboards/taleguers/taleguers75/info.json
+++ b/keyboards/taleguers/taleguers75/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 6,
"sleep": true,
"led_map": [5, 4, 3, 2, 1, 0]
},
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index e3d6e2b907d..b09625ec9e8 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json
index b2b5b2f66fe..b741bac27e0 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h
index 948a4ecd346..f409cab98d3 100644
--- a/keyboards/teahouse/ayleen/config.h
+++ b/keyboards/teahouse/ayleen/config.h
@@ -3,7 +3,6 @@
#pragma once
- #define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json
index f8e983da186..f337b664c59 100644
--- a/keyboards/teahouse/ayleen/info.json
+++ b/keyboards/teahouse/ayleen/info.json
@@ -20,6 +20,7 @@
"cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"]
},
"rgblight": {
+ "led_count": 2,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index 792115c45f4..088ab5f974c 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json
index 8073ac5de78..8cf18484cf0 100644
--- a/keyboards/team0110/p1800fl/info.json
+++ b/keyboards/team0110/p1800fl/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 8,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index e2b68ec90d7..3717a6d07c6 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
index 8331e97d3aa..aef2e84002f 100644
--- a/keyboards/technika/info.json
+++ b/keyboards/technika/info.json
@@ -22,6 +22,7 @@
"pin": "B15"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index 6bac4f33494..387afe71b60 100644
--- a/keyboards/tenki/config.h
+++ b/keyboards/tenki/config.h
@@ -18,7 +18,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 3 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json
index 7f9600739f5..f6ec838b003 100644
--- a/keyboards/tenki/info.json
+++ b/keyboards/tenki/info.json
@@ -9,6 +9,7 @@
"device_version": "10.0.1"
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index 96298336e82..bd22162116f 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -22,7 +22,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 47
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json
index 7c97497e333..47b827ce1d0 100644
--- a/keyboards/tetris/info.json
+++ b/keyboards/tetris/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 47,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 5dab3ee20ac..39ae589193f 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json
index db3cc0e5805..68d70cfbc9a 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -9,6 +9,7 @@
"device_version": "0.2.1"
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index 2021d94bb46..7e1218690b8 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 19
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json
index ae6ffb5a245..2ad4ca9cb2c 100644
--- a/keyboards/tgr/910/info.json
+++ b/keyboards/tgr/910/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 19
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index 44fff35e61f..bf084f49fa8 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 18
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json
index c58438887ae..f93b5d22216 100644
--- a/keyboards/tgr/910ce/info.json
+++ b/keyboards/tgr/910ce/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index cf8aa330451..d849732a072 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index 7d6a0fbc146..356719df154 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index f517c91d194..7e1218690b8 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json
index f628405bcb8..ab1defbf406 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index 02c222b2b85..6632bb858a4 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -5,9 +5,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 1 // Number of LEDs
-
#define RGBLIGHT_HUE_STEP 6
#define RGBLIGHT_SAT_STEP 4
#define RGBLIGHT_VAL_STEP 4
diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index c62699df844..1ee4a78c53f 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -8,6 +8,9 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 8cfda8f8e50..ca3ee0662ca 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -5,9 +5,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGBLED_NUM 8 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index df765f747c6..382217f35ca 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -8,6 +8,9 @@
"pid": "0x3521",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index 3ce29c3aa38..f08a0cdc2c4 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB BackLight */
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
index e6dc6137dbf..47c9c37c919 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index 3ce29c3aa38..f08a0cdc2c4 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB BackLight */
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
index a460e587afd..5e9b8b91b89 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -19,6 +19,7 @@
]
},
"rgblight": {
+ "led_count": 4,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index e8aca5e8620..ecb3e017604 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
/* Define RGB Underglow */
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json
index 80281fef1f8..ed6896dc2e1 100644
--- a/keyboards/thevankeyboards/jetvan/info.json
+++ b/keyboards/thevankeyboards/jetvan/info.json
@@ -8,6 +8,9 @@
"pid": "0x8858",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D0"
},
diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
index 168b85c6142..5070f051560 100644
--- a/keyboards/thevankeyboards/minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/config.h
@@ -21,6 +21,3 @@ along with this program. If not, see .
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* RGB Setup */
-#define RGBLED_NUM 3
diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json
index d9ae934b6ff..cff65e6fed8 100644
--- a/keyboards/thevankeyboards/minivan/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.2"
},
"rgblight": {
+ "led_count": 3,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index e995bb1c7c1..3f67f77910f 100644
--- a/keyboards/tkc/godspeed75/config.h
+++ b/keyboards/tkc/godspeed75/config.h
@@ -32,7 +32,6 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index 4e45459bb96..6565239b520 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -8,6 +8,9 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "A13"
},
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index bc6ea7809fb..a2182857fb3 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 30
# define RGBLIGHT_HUE_STEP 5
# define RGBLIGHT_SAT_STEP 10
# define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index 37a8c19bf80..b58c6300892 100644
--- a/keyboards/tkc/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
@@ -27,6 +27,9 @@
"num_lock": "D2",
"scroll_lock": "D4"
},
+ "rgblight": {
+ "led_count": 30
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index 0241c954ffc..839108fe8b8 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 9
// #define RGBLIGHT_HUE_STEP 10
// #define RGBLIGHT_SAT_STEP 17
// #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json
index 8173bb808d9..7a59bb65dbf 100644
--- a/keyboards/tkc/osav2/info.json
+++ b/keyboards/tkc/osav2/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index dd6631f5456..363e1d894ae 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 30 // Number of LEDs
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index 5cf8f83c808..4b61485d2ef 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -27,6 +27,9 @@
"num_lock": "D2",
"scroll_lock": "D4"
},
+ "rgblight": {
+ "led_count": 30
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 667d79d2775..c5c9bc51901 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
- #define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index 5157fe9bc96..523f923e9b2 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 22,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 02746f94a81..0fee7d0f77c 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -20,7 +20,6 @@
#define MATRIX_IO_DELAY 5
#define TAP_CODE_DELAY 10
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index d3f6256d462..a7ff7dd90ff 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -11,6 +11,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 120,
"split_count": [8, 8]
},
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 3e5d5a452a3..5f391a21876 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -18,7 +18,6 @@
#define MATRIX_IO_DELAY 5
#define TAP_CODE_DELAY 10
-#define RGBLED_NUM 13
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index e0cc720365c..a73b8f5e3b1 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -13,6 +13,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 13,
"max_brightness": 120
},
"matrix_pins": {
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 1915c926d31..257a3801a14 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json
index 07edc4d43e2..a4327ca7083 100644
--- a/keyboards/tmo50/info.json
+++ b/keyboards/tmo50/info.json
@@ -18,6 +18,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h
index 4b24094b220..4708cd179b9 100644
--- a/keyboards/toffee_studio/blueberry/config.h
+++ b/keyboards/toffee_studio/blueberry/config.h
@@ -16,7 +16,6 @@
#pragma once
-# define RGBLED_NUM 22
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json
index eb32a1209da..f14afaaced5 100644
--- a/keyboards/toffee_studio/blueberry/info.json
+++ b/keyboards/toffee_studio/blueberry/info.json
@@ -12,6 +12,7 @@
"pin": "D0"
},
"rgblight": {
+ "led_count": 22,
"max_brightness": 192,
"led_map": [19, 18, 17, 16, 15, 14, 13, 12, 11, 20, 10, 21, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8]
},
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index fad2d49c938..25048d8fb34 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
index d71fb56f0bc..3ac2ae46053 100644
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ b/keyboards/tokyokeyboard/alix40/info.json
@@ -18,6 +18,9 @@
"levels": 31,
"breathing": true
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index dd58e34f08f..5ee84017377 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index aae81a4a6b6..45827bc0fa8 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -18,6 +18,9 @@
"pin": "B7",
"levels": 6
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
index 77d49adbec4..b2eb60a0779 100755
--- a/keyboards/tominabox1/bigboy/config.h
+++ b/keyboards/tominabox1/bigboy/config.h
@@ -16,8 +16,6 @@
#pragma once
- #define RGBLED_NUM 5
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json
index 87f8473bb8a..44bc4dea8d4 100644
--- a/keyboards/tominabox1/bigboy/info.json
+++ b/keyboards/tominabox1/bigboy/info.json
@@ -8,6 +8,9 @@
"pid": "0x6262",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index fb3860b0eb7..bc1950aefe4 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -24,9 +24,7 @@
* WS2812 Underglow Matrix options
*/
-#define RGBLED_NUM 11
-
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 11
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json
index bab0d5242c5..8c8e7f5b09c 100644
--- a/keyboards/tominabox1/le_chiffre/he/info.json
+++ b/keyboards/tominabox1/le_chiffre/he/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.3"
},
+ "rgblight": {
+ "led_count": 11
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json
index 5222f4ea514..32e08029d5a 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 11
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json
index f6773fb9bdf..0dd86e58480 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 11
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index a9b9df68157..e1992baa6f2 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -15,7 +15,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 21
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json
index 99ae387af7b..98706203c08 100644
--- a/keyboards/tominabox1/qaz/info.json
+++ b/keyboards/tominabox1/qaz/info.json
@@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 21
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index eac1807676e..1ea0b6598d2 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/config.h
@@ -21,7 +21,6 @@
#define LOCKING_RESYNC_ENABLE
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
index 2b93047d410..5553a11d9a9 100644
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ b/keyboards/tominabox1/underscore33/rev2/info.json
@@ -8,6 +8,9 @@
"pid": "0x3302",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index a6dfefb6b90..401de718c15 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -16,7 +16,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
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 62e5fae73b0..b47482ccd8c 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 5472320cc0c..ff4749b2902 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -22,7 +22,6 @@ SOFTWARE.
#pragma once
-#define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 592f4e24ac8..75bfb0b0736 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -10,6 +10,7 @@
"max_power": 100
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index 2ed9b5c0080..ef6b39e64fd 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 18
-
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index d1afed5f0c0..44b550af266 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
index 5ab6f8a3475..edfd0825c6e 100644
--- a/keyboards/tunks/ergo33/config.h
+++ b/keyboards/tunks/ergo33/config.h
@@ -28,14 +28,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#if !defined(RGBLED_NUM)
-/* RGB LED count
- * No external LED PCB: 10
- * External LED PCB: 14
- */
-# define RGBLED_NUM 14
-#endif
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json
index afca170abd8..e5b1e6f5193 100644
--- a/keyboards/tunks/ergo33/info.json
+++ b/keyboards/tunks/ergo33/info.json
@@ -7,6 +7,9 @@
"pid": "0xA0A1",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "D4"
},
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index 7c938233140..c335ed5cca3 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 15
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json
index d57206cbc5e..b09acc66d15 100644
--- a/keyboards/tw40/info.json
+++ b/keyboards/tw40/info.json
@@ -8,6 +8,9 @@
"pid": "0x5457",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index 5ced7003233..5dffc00141f 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -14,7 +14,6 @@
#endif // SERIAL_USART_SPEED
// RGB configuration
-#define RGBLED_NUM 84
#define RGB_MATRIX_LED_COUNT 84
#define RGB_MATRIX_SPLIT \
{ 42, 42 }
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index 02224e4fc61..12a63724057 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -17,7 +17,6 @@
#define SERIAL_USART_FULL_DUPLEX
// RGB configuration
-#define RGBLED_NUM 86
#define RGB_MATRIX_LED_COUNT 86
#define RGB_MATRIX_SPLIT \
{ 43, 43 }
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index c027b77565d..932ea8eb50d 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -13,4 +13,3 @@
// RGB configuration
#define RGB_MATRIX_LED_COUNT 40
-#define RGBLED_NUM 40
diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h
index 26f27d5bde5..9ec93057a91 100644
--- a/keyboards/ubest/vn/config.h
+++ b/keyboards/ubest/vn/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index d2ab82b39bd..8a84edb4c4d 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -20,6 +20,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 240,
"sleep": true
},
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index ab971a55ad8..ce794b87d46 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json
index f166936a9a2..4b07fffb398 100644
--- a/keyboards/uk78/info.json
+++ b/keyboards/uk78/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index 9c6459abbda..5505279b1b6 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -21,8 +21,7 @@
/* RGB Matrix configuration */
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 22
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 22
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index 4c3789155ee..d0153fcff02 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 17
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json
index 02202bef077..5bd23e612ec 100644
--- a/keyboards/unikorn/info.json
+++ b/keyboards/unikorn/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index b7cfe159a8f..fe28e7fc000 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#endif
/* RGB Lighting */
- #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5)
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index b3c9a59392b..b9754062afd 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -13,6 +13,7 @@
"rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
},
"rgblight": {
+ "led_count": 7,
"led_map": [1, 2, 0, 3, 4, 5, 6]
},
"ws2812": {
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 5d33e9e99cb..e535bc7496c 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -31,7 +31,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
diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index 5a7bde1da1c..1659fbd0ab6 100644
--- a/keyboards/utd80/info.json
+++ b/keyboards/utd80/info.json
@@ -21,6 +21,9 @@
"caps_lock": "B6",
"scroll_lock": "B5"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 033d1ab111d..5fc06a60429 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 54 // Number of LEDs
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index a9e0b278264..a25e5fd428c 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 54,
"max_brightness": 120,
"split_count": [27, 27]
},
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 8eafa8d7b51..34403d0c97d 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 1
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json
index f219dd1727a..8a2b7827ceb 100644
--- a/keyboards/v60_type_r/info.json
+++ b/keyboards/v60_type_r/info.json
@@ -17,6 +17,9 @@
"pin": "F7",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 1
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_iso"],
diff --git a/keyboards/vertex/angle65/config.h b/keyboards/vertex/angle65/config.h
index 4db0deb111f..74731dd4c93 100644
--- a/keyboards/vertex/angle65/config.h
+++ b/keyboards/vertex/angle65/config.h
@@ -28,6 +28,5 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json
index 03649ab0725..2ad59e06429 100644
--- a/keyboards/vertex/angle65/info.json
+++ b/keyboards/vertex/angle65/info.json
@@ -20,6 +20,9 @@
"caps_lock": "C13",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index 79cb6d6aaed..35c5c2609ef 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 705af3fb092..db4d8e31cf8 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -21,6 +21,9 @@
"ws2812": {
"pin": "E6"
},
+ "rgblight": {
+ "led_count": 6
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": [
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 791368b5b2c..3cd8a8c9380 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index 8aa5a709d50..5564b0d3c7e 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -18,6 +18,9 @@
"caps_lock": "C13",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index e4cb0453537..81b5383ef34 100644
--- a/keyboards/vertex/arc60h/config.h
+++ b/keyboards/vertex/arc60h/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 9
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 831190a516b..baf91b0c61c 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -9,6 +9,9 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
index 825ceabbd31..078b8e1e5d1 100644
--- a/keyboards/viendi8l/config.h
+++ b/keyboards/viendi8l/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see .
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-#define RGBLED_NUM 4
#define RGBLIGHT_DEFAULT_VAL 0
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 301b5cc7565..17449f406c8 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -8,6 +8,9 @@
"pid": "0x0877",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B15",
"driver": "pwm"
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index b6064e3f528..d83026859dc 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -35,8 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 6c6a5a8d2dc..60b4d1996b1 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -27,6 +27,7 @@
}
},
"rgblight": {
+ "led_count": 24,
"split_count": [12, 12]
},
"ws2812": {
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index 81dd72ca9ea..fc729396a84 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index f9fd3d018e9..579ba50d14f 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -10,6 +10,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index b86a722674a..b4daf909dd4 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN B4
-#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index c90a668ba0c..3c87742bcd7 100644
--- a/keyboards/vitamins_included/rev2/info.json
+++ b/keyboards/vitamins_included/rev2/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D0"
},
"rgblight": {
+ "led_count": 12,
"split_count": [6, 6]
},
"ws2812": {
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index ee7a78dd0cf..ef466015c28 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -49,7 +49,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index ff8c7045086..76dded55b1f 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -17,6 +17,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 6d33342cf8a..343448b6cdd 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -32,7 +32,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
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index 36b66474653..6bc160225e8 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -18,6 +18,9 @@
{"pin_a": "D6", "pin_b": "D7"}
]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 2dae864ddb2..401de718c15 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -16,7 +16,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
diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json
index fb6b3e96f8e..298664e1394 100644
--- a/keyboards/walletburner/neuron/info.json
+++ b/keyboards/walletburner/neuron/info.json
@@ -8,6 +8,9 @@
"pid": "0x6E75",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 4c7cede5441..de2168ce7f9 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -3,7 +3,6 @@
#pragma once
-# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index c437b1841bf..491a975e66c 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index 0e41f95fd01..36013d40946 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index a00bd259518..7f2d0275b24 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
index 948bd0c7f1f..5e0e8b40a9f 100644
--- a/keyboards/weirdo/geminate60/config.h
+++ b/keyboards/weirdo/geminate60/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 1
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json
index e8bda126ea0..722d1d3bfe0 100644
--- a/keyboards/weirdo/geminate60/info.json
+++ b/keyboards/weirdo/geminate60/info.json
@@ -8,6 +8,9 @@
"pid": "0x676D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "A6"
},
diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
index 0a446abebab..5c0ed9cf612 100644
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ b/keyboards/weirdo/kelowna/rgb64/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 64
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json
index 89053ba9cca..12188f6f302 100644
--- a/keyboards/weirdo/kelowna/rgb64/info.json
+++ b/keyboards/weirdo/kelowna/rgb64/info.json
@@ -8,6 +8,9 @@
"pid": "0x4C64",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 64
+ },
"ws2812": {
"pin": "A6"
},
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index d2b9299c8f0..5c0ed9cf612 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 1
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
index f386d40b669..0dadf9d32ce 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,6 +8,9 @@
"pid": "0x4C53",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "A6"
},
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
index 2c312472777..2c7e4c037b5 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 80
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
index 0f91be1b839..63e6297f7d5 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,9 @@
"pid": "0x7064",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 80
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 0a3df009abe..5c0ed9cf612 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 78
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index 730c17c61fa..931f81db1f0 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,9 @@
"pid": "0x7068",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 78
+ },
"ws2812": {
"pin": "A7"
},
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 782833a3afd..5c0ed9cf612 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 82
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index 5162849225e..3824802e020 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,9 @@
"pid": "0x706D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 82
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 27467c648f0..488d5c5f78c 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 15d0f6bb7c5..509e1ceb0a5 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 9,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index d5998830a4c..145d0fe0cfc 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
*/
#define GRAVE_ESC_CTRL_OVERRIDE
- #define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index df3a21dd8a2..fa5a9027481 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -17,6 +17,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 10,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index db711fcfd97..af49da747a5 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json
index 70c31e162b6..c81abf26114 100644
--- a/keyboards/westm/westm68/rev1/info.json
+++ b/keyboards/westm/westm68/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"pid": "0x0101"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "A8"
}
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
index db711fcfd97..af49da747a5 100644
--- a/keyboards/westm/westm68/rev2/config.h
+++ b/keyboards/westm/westm68/rev2/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json
index 50711496d3c..3bb3362a7d0 100644
--- a/keyboards/westm/westm68/rev2/info.json
+++ b/keyboards/westm/westm68/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"pid": "0x0102"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "A8"
}
diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h
index 17de75167cd..2985e7ec596 100644
--- a/keyboards/westm/westm9/rev1/config.h
+++ b/keyboards/westm/westm9/rev1/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json
index 5986e5c1c8d..06998fc670b 100644
--- a/keyboards/westm/westm9/rev1/info.json
+++ b/keyboards/westm/westm9/rev1/info.json
@@ -2,6 +2,9 @@
"usb": {
"pid": "0x0301"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "F1"
}
diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h
index 17de75167cd..2985e7ec596 100644
--- a/keyboards/westm/westm9/rev2/config.h
+++ b/keyboards/westm/westm9/rev2/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json
index faebf5d443c..dfe9215991e 100644
--- a/keyboards/westm/westm9/rev2/info.json
+++ b/keyboards/westm/westm9/rev2/info.json
@@ -2,6 +2,9 @@
"usb": {
"pid": "0x0302"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "F1"
}
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index 2b648278565..2470026c0a2 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -26,7 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index 30e82dfad69..6b8ac581687 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,6 +8,9 @@
"pid": "0x0201",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "A8"
},
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index 914d9b2763c..3408a65ee4b 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -21,7 +21,6 @@
#define LOCKING_RESYNC_ENABLE
// RGBLIGHT configuation
- #define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json
index d750e86d90a..b04b964090f 100644
--- a/keyboards/wilba_tech/wt70_jb/info.json
+++ b/keyboards/wilba_tech/wt70_jb/info.json
@@ -8,6 +8,9 @@
"pid": "0x001F",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "B2"
},
diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h
index b585802fb85..5ab439e5744 100644
--- a/keyboards/winkeyless/b87/config.h
+++ b/keyboards/winkeyless/b87/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 20 // Number of LEDs
// RGB effects
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index 10b20c41c01..1b2e0f25c29 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index b7529e43111..e24f2037b0c 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index 2d716a89c78..2b31d7c3abc 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index ddc21dae308..d849732a072 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 16
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 2a18caeed4c..10a51febc0f 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -16,6 +16,9 @@
"backlight": {
"pin": "D4"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 116c09d6ac7..d849732a072 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define RGBLED_NUM 20
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 03a8e408b51..24d205334c0 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -17,6 +17,9 @@
"pin": "D4",
"levels": 5
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
index 73844a7bc7f..eadcfab244e 100644
--- a/keyboards/winkeys/mini_winni/config.h
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
index 7828dba4689..139a50f320f 100644
--- a/keyboards/winkeys/mini_winni/info.json
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -15,6 +15,9 @@
["F6", "F7", "B6", "B5"]
]
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
index 98c540c876a..231f392e4fb 100644
--- a/keyboards/winry/winry25tc/config.h
+++ b/keyboards/winry/winry25tc/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGBLED_NUM 40
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 40768171e4a..56157c2416f 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -12,6 +12,7 @@
"pin": "D5"
},
"rgblight": {
+ "led_count": 40,
"max_brightness": 150
},
"matrix_pins": {
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 7e292211562..ba3c2a05c1d 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -9,11 +9,6 @@
// clang-format on
-// RGB LED parameters.
-// This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for
-// per-key backlight and underglow.
-#define RGBLED_NUM 27
-
// RGB Lighting configuration. This mode is used by the vendor firmware, and
// can be chosen if the full RGB Matrix support is not desired for some reason.
#ifdef RGBLIGHT_ENABLE
@@ -33,7 +28,7 @@
// RGB Matrix configuration.
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 27
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
# define RGB_MATRIX_CENTER \
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index 095dd429fd4..7e810d229c9 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 27,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index b241c19aac3..1bc729f9099 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* Define RGB Underglow */
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 49d9f598171..3719cb3bf7e 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -18,6 +18,7 @@
"levels": 6
},
"rgblight": {
+ "led_count": 16,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index c1d3b49a076..cb3f35675ca 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 87f7e1ebd07..832f313e7d2 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"rgblight": {
+ "led_count": 18,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index d81dd8611b7..1c7d931f6c3 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -33,5 +33,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#endif
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index 1dd1e6fa0c7..9eb49434d91 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 5,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index ecb56494192..1c7d931f6c3 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -33,5 +33,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#endif
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index a488fc1515a..5d1b49144bf 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index a225c19d3a4..1c7d931f6c3 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -33,5 +33,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 11
#endif
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index 0152a2ce040..a11ed9217f7 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 11,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index 02ed67b9cb5..1c7d931f6c3 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -33,5 +33,4 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#endif
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index e228efd54ce..ee77da7eb84 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -12,6 +12,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 12,
"max_brightness": 128
},
"matrix_pins": {
diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h
index d5bdf9540c6..3d10842a94d 100644
--- a/keyboards/woodkeys/meira/config.h
+++ b/keyboards/woodkeys/meira/config.h
@@ -26,7 +26,3 @@ along with this program. If not, see .
//#define DIODE_DIRECTION
#define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 15 // Number of LEDs
-#endif
diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json
index e39df58323a..5905c00d2d0 100644
--- a/keyboards/woodkeys/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
@@ -12,6 +12,9 @@
"driver": "custom",
"levels": 10
},
+ "rgblight": {
+ "led_count": 15
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index 3854dc86596..45b5100891f 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8 // Number of LEDs
#endif
#ifdef AUDIO_ENABLE
diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
index d74555a178d..49177ea718b 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
@@ -8,6 +8,9 @@
"pid": "0x6969",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/work_louder/loop/rev1/config.h b/keyboards/work_louder/loop/rev1/config.h
deleted file mode 100644
index 1bc02d08a68..00000000000
--- a/keyboards/work_louder/loop/rev1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-# define RGBLED_NUM 24
diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/info.json
index 90ac25f360b..3caea9b338f 100644
--- a/keyboards/work_louder/loop/rev1/info.json
+++ b/keyboards/work_louder/loop/rev1/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 24
}
}
diff --git a/keyboards/work_louder/loop/rev3/config.h b/keyboards/work_louder/loop/rev3/config.h
deleted file mode 100644
index 5451d4466e2..00000000000
--- a/keyboards/work_louder/loop/rev3/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 11
diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/info.json
index b377cdff008..603bca5c6a4 100644
--- a/keyboards/work_louder/loop/rev3/info.json
+++ b/keyboards/work_louder/loop/rev3/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.3"
+ },
+ "rgblight": {
+ "led_count": 11
}
}
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index d7f8268e87c..cf1e7946345 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGBLIGHT_DI_PIN C7
-#define RGBLED_NUM 6
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
//# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index c01e7c68053..5b95e7d2aa3 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -26,6 +26,7 @@
"pin": "F6"
},
"rgblight": {
+ "led_count": 6,
"max_brightness": 120,
"sleep": true
},
diff --git a/keyboards/work_louder/work_board/rev1/config.h b/keyboards/work_louder/work_board/rev1/config.h
deleted file mode 100644
index b7d85d490d9..00000000000
--- a/keyboards/work_louder/work_board/rev1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-# define RGBLED_NUM 26
diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/info.json
index 90ac25f360b..9884ca6e489 100644
--- a/keyboards/work_louder/work_board/rev1/info.json
+++ b/keyboards/work_louder/work_board/rev1/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 26
}
}
diff --git a/keyboards/work_louder/work_board/rev3/config.h b/keyboards/work_louder/work_board/rev3/config.h
deleted file mode 100644
index 8e3cd8bce80..00000000000
--- a/keyboards/work_louder/work_board/rev3/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 19
diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/info.json
index b377cdff008..63e757dfe21 100644
--- a/keyboards/work_louder/work_board/rev3/info.json
+++ b/keyboards/work_louder/work_board/rev3/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.3"
+ },
+ "rgblight": {
+ "led_count": 19
}
}
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index defc0a92dcb..1bb084c226d 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -32,7 +32,6 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 0b158630599..cfa9b7488d4 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -17,6 +17,9 @@
"caps_lock": "D3",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index a14f9dbde2f..343448b6cdd 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -32,7 +32,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json
index e9c24279f3d..8fdcdb9b44f 100644
--- a/keyboards/wsk/g4m3ralpha/info.json
+++ b/keyboards/wsk/g4m3ralpha/info.json
@@ -8,6 +8,9 @@
"pid": "0x56D9",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index 541e19beced..ccbbb0f4e15 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -10,7 +10,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
diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json
index 8cc09718799..d4bfbea6cc9 100644
--- a/keyboards/wsk/gothic50/info.json
+++ b/keyboards/wsk/gothic50/info.json
@@ -8,6 +8,9 @@
"pid": "0x04EF",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "F7"
},
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index b6ee3e9cc88..36b441723b8 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -10,7 +10,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json
index 06ee936ce7d..668e9f3270f 100644
--- a/keyboards/wsk/gothic70/info.json
+++ b/keyboards/wsk/gothic70/info.json
@@ -8,6 +8,9 @@
"pid": "0x63CC",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index da4d3257a62..401de718c15 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -16,7 +16,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
diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index b5d0f9459b7..77296d5cdcd 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -8,6 +8,9 @@
"pid": "0x72D4",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index edc623d08fa..401de718c15 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json
index f542c999a17..da6cfd25c62 100644
--- a/keyboards/wsk/pain27/info.json
+++ b/keyboards/wsk/pain27/info.json
@@ -8,6 +8,9 @@
"pid": "0x9E8C",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index d33de62b5fb..343448b6cdd 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -32,7 +32,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
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index 09f5f988142..e107cdd7772 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -8,6 +8,9 @@
"pid": "0xC456",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "F1"
},
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 2dae864ddb2..401de718c15 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -16,7 +16,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
diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json
index 10465560518..e39759a24c5 100644
--- a/keyboards/wsk/tkl30/info.json
+++ b/keyboards/wsk/tkl30/info.json
@@ -8,6 +8,9 @@
"pid": "0x0B7F",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B1"
},
diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h
index 29616b4d056..d4bc94ce44c 100644
--- a/keyboards/wuque/creek70/config.h
+++ b/keyboards/wuque/creek70/config.h
@@ -16,7 +16,6 @@
#pragma once
-# define RGBLED_NUM 7
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
index c7428d1d844..003077e6519 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/info.json
@@ -30,6 +30,7 @@
"pin": "D0"
},
"rgblight": {
+ "led_count": 7,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 23a13979772..88def545345 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index c20d7f5ebe3..4c15f49bc89 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -12,6 +12,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 3dd3c811353..1d97814898b 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index f0709378222..37546909b5a 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 20,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index 2fc003611a4..3ed379dc892 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index be6ac0e4bff..2d872cd03b0 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -21,6 +21,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 1,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index 2fc003611a4..3ed379dc892 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index e80cad677c3..ff20de6bd0d 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -21,6 +21,7 @@
"pin": "D2"
},
"rgblight": {
+ "led_count": 1,
"max_brightness": 200,
"sleep": true
},
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index ae0e6921916..1c83936021c 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB Lighting */
-#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json
index 320ad9824bb..c55e16f75ea 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,9 @@
"pid": "0xA04B",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index a922b89dbf2..5611293717c 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB Underglow */
-#define RGBLED_NUM 26
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index 242362ab7e2..f682e7d6441 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -13,6 +13,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 26,
"max_brightness": 200
},
"matrix_pins": {
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index c431ddad873..2a9944eaaba 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -17,7 +17,6 @@
#pragma once
/* RGB Underglow */
-#define RGBLED_NUM 28
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 2545fb24b01..b157de001a2 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -12,6 +12,7 @@
"pin": "B0"
},
"rgblight": {
+ "led_count": 28,
"max_brightness": 200
},
"matrix_pins": {
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index cc63e70bb40..e5acad6f9c8 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -40,7 +40,6 @@
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
/* RGB Matrix */
-#define RGBLED_NUM 28
#define RGB_MATRIX_LED_COUNT 28
#define NOP_FUDGE 0.4
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 242560c0678..d1138c735de 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -38,7 +38,6 @@
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
// RGBLIGHT
-#define RGBLED_NUM 8 // actually only has 1
#define RGBLIGHT_LAYERS
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json
index 4d6888f7076..81cf86498b2 100644
--- a/keyboards/xelus/xs60/hotswap/info.json
+++ b/keyboards/xelus/xs60/hotswap/info.json
@@ -8,6 +8,9 @@
"pid": "0x5861",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "A10"
},
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index cbbdc49b122..4b7be4d4414 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -37,7 +37,6 @@
// More EEPROM for layers
// RGBLIGHT
-#define RGBLED_NUM 8 // actually only has 1
#define RGBLIGHT_LAYERS
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/info.json
index 6e540617c24..20de0ef8377 100644
--- a/keyboards/xelus/xs60/soldered/info.json
+++ b/keyboards/xelus/xs60/soldered/info.json
@@ -8,6 +8,9 @@
"pid": "0x5860",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "A10"
},
diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index d442ee57623..0d0cd3712a7 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#define RGBLED_NUM 2
-
// Save as much space as we can...
#define LAYER_STATE_8BIT
#define NO_ACTION_LAYER
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index cce509be798..1e0b22f96b1 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -8,6 +8,9 @@
"pid": "0x0202",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "B2"
},
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index 597c5dc818f..84a0e886427 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -11,6 +11,9 @@
"pin": "D5",
"levels": 6
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "C6"
},
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 823ba863588..56c2be55f54 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -30,7 +30,6 @@ further optimizations can be done on that side.
*/
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index 21efad0d810..2b79ba9d0d6 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 6 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index c45ef7af643..9c954df6b5a 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -13,6 +13,9 @@
"levels": 6,
"on_state": 0
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index f8845d411fa..1eb6ccf91b5 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 68c97c0a9e8..bc369db5077 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -13,6 +13,9 @@
"levels": 6,
"on_state": 0
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index e62b98a12d1..8c6cde9e27d 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -49,7 +49,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12 // number of LEDs
#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 0522a66e572..3bcb6835651 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -19,6 +19,9 @@
"breathing": true,
"on_state": 0
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index eb79d2d7724..6e2f2f6dc2d 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 12
# define RGBLIGHT_SAT_STEP 25
# define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index bc2e724214d..c95ee8b70c0 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"on_state": 0
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "F6"
},
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 42cce6f1c07..b8a88557230 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -21,7 +21,6 @@
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
-#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index f7bfaeaebd0..6c79ba9aae8 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -17,6 +17,9 @@
"caps_lock": "B6",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 7
+ },
"ws2812": {
"pin": "C7"
},
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 35f70798e5c..b91af3c0dcd 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -16,7 +16,6 @@
#pragma once
- #define RGBLED_NUM 12
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index ec03a4e0024..1df9eccb0f0 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -23,6 +23,7 @@
"on_state": 0
},
"rgblight": {
+ "led_count": 12,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index d89929e9c82..e34283e8007 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 5aa56a60e9d..09a779be63b 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -21,6 +21,9 @@
"caps_lock": "E2",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B7"
},
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 5329d514832..229eb3e0863 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -21,7 +21,6 @@
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 5a043101301..44b797c04ce 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -13,6 +13,7 @@
"levels": 10
},
"rgblight": {
+ "led_count": 16,
"max_brightness": 50
},
"indicators": {
diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h
index 6327578ebfe..07fa2b40fa2 100644
--- a/keyboards/yampad/config.h
+++ b/keyboards/yampad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* Underlight configuration */
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
index 54c363b28bb..da0ed58f71c 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -8,6 +8,9 @@
"pid": "0x8369",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "F4"
},
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 677e41a00d6..218f2dc3a8c 100644
--- 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
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 69d4903bd63..d750cd69546 100644
--- 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"
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index 7cd12d4b36d..c66a3aae166 100644
--- 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
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index db91c290ecb..c5ffdd43366 100644
--- 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
},
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index c6760befde4..5d7aac48d9b 100644
--- 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
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 32d0e292639..c2ecd21eae7 100644
--- 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": {
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 5e4cdaaea0c..4dceae6d87c 100644
--- 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
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 6c054018d18..332f9403057 100644
--- 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"
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 860ee45381b..c7358c5b068 100644
--- 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
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 373b5bcbf93..afad099f448 100644
--- 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
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 74c8f4adce7..40c148636fe 100644
--- 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
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 3ec826052cf..77432a994c9 100644
--- 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"
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index 0e8602dee9f..d2f62283084 100644
--- 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
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index 7faaa482eff..3db1d88e267 100644
--- 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"
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 8a4ce9ec490..f443f8c5540 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -29,8 +29,6 @@
#define AUDIO_PWM_CHANNEL 1
/* RGB LED */
-#define RGBLED_NUM 8
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 52a703d2191..9a6f4c9e801 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -8,6 +8,9 @@
"pid": "0x0204",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 8
+ },
"ws2812": {
"pin": "B1",
"driver": "pwm"
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index dd6631f5456..363e1d894ae 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 30 // Number of LEDs
#define RGBLIGHT_HUE_STEP 5
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index 998f3073e1f..786bdca2762 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 30
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
index 0d488de5d41..c0bea85abae 100644
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@@ -24,10 +24,6 @@
#define SN74X138_ADDRESS_PINS { D2, D1, D0 }
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 4
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
index 17d2f88773d..32c9914bdbc 100644
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@@ -12,6 +12,9 @@
"pin": "B7",
"breathing": true
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index 99148038538..a4d55c248c1 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index b552f9e2cf7..6630ea403d5 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -17,6 +17,9 @@
"caps_lock": "D4",
"on_state": 0
},
+ "rgblight": {
+ "led_count": 10
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
index 19627f889fa..d97ef93440f 100644
--- a/keyboards/yeehaw/config.h
+++ b/keyboards/yeehaw/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
- #define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json
index 24a1447bcda..16f9542a140 100644
--- a/keyboards/yeehaw/info.json
+++ b/keyboards/yeehaw/info.json
@@ -14,6 +14,7 @@
]
},
"rgblight": {
+ "led_count": 7,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index 08303c4b13e..816875f94ac 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json
index 09441c5dbdc..8e413c1702a 100644
--- a/keyboards/ymdk/bface/info.json
+++ b/keyboards/ymdk/bface/info.json
@@ -17,6 +17,9 @@
"pin": "D4",
"levels": 6
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index a62c64fb37b..401de718c15 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -16,7 +16,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
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 83c45eaa6be..5903c2af6f3 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -17,6 +17,9 @@
"pin": "B6",
"levels": 5
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 1d20ad110d6..994e71507ce 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 5
//#define RGBLIGHT_HUE_STEP 8
//#define RGBLIGHT_SAT_STEP 8
//#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json
index 62fdf7e20c7..0e9f8a7a540 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -18,6 +18,9 @@
"levels": 12,
"breathing": true
},
+ "rgblight": {
+ "led_count": 5
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 0f6e31d199f..d6441690395 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
-# define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 285baacdac0..fcd7bf516d8 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -16,6 +16,9 @@
"pin": "B7",
"levels": 31
},
+ "rgblight": {
+ "led_count": 6
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h
index 8e3de2387da..18732f8ed64 100644
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define RIGHT_HALF
/* RGB underglow */
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json
index b972d634f7b..d0ca560e847 100644
--- a/keyboards/ymdk/sp64/info.json
+++ b/keyboards/ymdk/sp64/info.json
@@ -17,6 +17,7 @@
"driver": "i2c"
},
"rgblight": {
+ "led_count": 12,
"max_brightness": 250,
"sleep": true
},
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 30144bcdac3..0d72c8464c6 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 19b7102dc04..971b8e743a5 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -18,6 +18,7 @@
"levels": 5
},
"rgblight": {
+ "led_count": 14,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 4c691f9ff95..ef09c08a2ce 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -13,7 +13,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 80
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 000051e7b0d..a13c1a6950e 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -25,6 +25,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 80,
"max_brightness": 160,
"sleep": true
},
diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h
deleted file mode 100644
index edea795f788..00000000000
--- a/keyboards/ymdk/yd60mq/12led/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 12
diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/info.json
index 90ac25f360b..2c9ef7320e3 100644
--- a/keyboards/ymdk/yd60mq/12led/info.json
+++ b/keyboards/ymdk/yd60mq/12led/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
}
}
diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h
deleted file mode 100644
index 00d3fcfc8cb..00000000000
--- a/keyboards/ymdk/yd60mq/16led/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 16
diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/info.json
index e557e4d3076..48f9a19f9b3 100644
--- a/keyboards/ymdk/yd60mq/16led/info.json
+++ b/keyboards/ymdk/yd60mq/16led/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"device_version": "0.0.2"
+ },
+ "rgblight": {
+ "led_count": 16
}
}
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index 135548b4ff0..a8a0bb420a8 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -18,4 +18,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-// RGBLED_NUM is defined in revisions
diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h
index 3d79d49cfa8..0a5632e37b6 100644
--- a/keyboards/ymdk/ym68/config.h
+++ b/keyboards/ymdk/ym68/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json
index a66ddd4e7c9..96314a2707b 100644
--- a/keyboards/ymdk/ym68/info.json
+++ b/keyboards/ymdk/ym68/info.json
@@ -19,6 +19,7 @@
"breathing": true
},
"rgblight": {
+ "led_count": 20,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
index 8adc76dd6a7..6936d591e20 100644
--- a/keyboards/ymdk/ymd21/v2/config.h
+++ b/keyboards/ymdk/ymd21/v2/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
index 764bd9f0029..5bd3f23bf5c 100644
--- a/keyboards/ymdk/ymd21/v2/info.json
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 180,
"sleep": true
},
diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h
index cc789411e71..0a5632e37b6 100644
--- a/keyboards/ymdk/ymd40/v2/config.h
+++ b/keyboards/ymdk/ymd40/v2/config.h
@@ -17,7 +17,6 @@
#pragma once
#if defined(RGBLIGHT_ENABLE)
- #define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json
index 7fadfd2ab1e..f5229eabc35 100644
--- a/keyboards/ymdk/ymd40/v2/info.json
+++ b/keyboards/ymdk/ymd40/v2/info.json
@@ -21,6 +21,7 @@
"pin": "E2"
},
"rgblight": {
+ "led_count": 8,
"max_brightness": 150,
"sleep": true
},
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 8a3612b8a55..a8a0bb420a8 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -15,7 +15,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json
index 39801fe04e9..9f93ba55ef9 100644
--- a/keyboards/ymdk/ymd67/info.json
+++ b/keyboards/ymdk/ymd67/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 5
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
index 32bdab24781..99e7ce428bd 100644
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
index 930139be906..9f6081ebae2 100644
--- a/keyboards/ymdk/ymd75/info.json
+++ b/keyboards/ymdk/ymd75/info.json
@@ -7,6 +7,9 @@
"vid": "0x20A0",
"pid": "0x422D"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index ecb03b59175..f69fb22fc72 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define TAPPING_TOGGLE 3
/* RGB underglow */
-#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index f603439d398..ca123a3c521 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -19,6 +19,9 @@
"levels": 12,
"breathing": true
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"driver": "i2c"
},
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index f95770105c5..defa45cca5b 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see .
/* Layer Count */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
- #define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index cd5323e45b3..2e8ee32333d 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"rgblight": {
+ "led_count": 5,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index fc14be0ffe3..e5ff188046c 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
- #define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
index e550f9e2414..4f3112d09fe 100644
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ b/keyboards/yoichiro/lunakey_mini/info.json
@@ -17,6 +17,7 @@
"soft_serial_pin": "D2"
},
"rgblight": {
+ "led_count": 12,
"sleep": true,
"led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
"split_count": [6, 6]
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
deleted file mode 100644
index 4930c35c60e..00000000000
--- a/keyboards/yosino58/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12 // Number of LEDs
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
index 730c82faa48..c0dc03831fa 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 5a60a76931e..98776f87c29 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index 77ef8c6c0a2..6fce0d87f8e 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -16,6 +16,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 9,
"max_brightness": 120,
"sleep": true
},
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 431da219b03..70846564ac1 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define EE_HANDS
-# define RGBLED_NUM 9+32
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index fd3b2217080..9ad9ecc08ca 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -38,6 +38,7 @@
"pin": "D3"
},
"rgblight": {
+ "led_count": 41,
"max_brightness": 120,
"led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40],
"sleep": true,
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 247151181c4..a81fbb0dbe9 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -17,10 +17,8 @@ along with this program. If not, see .
#pragma once
-#define RGBLED_NUM 18
-
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 18
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index ce8c77933af..3a0391dafd2 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -12,6 +12,7 @@
"driver": "WS2812"
},
"rgblight": {
+ "led_count": 18,
"max_brightness": 150,
"led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5]
},
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index c285c65ef49..0ec9f0c2224 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 13
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json
index c877644479c..44b2c0cc984 100644
--- a/keyboards/yushakobo/quick7/info.json
+++ b/keyboards/yushakobo/quick7/info.json
@@ -15,6 +15,7 @@
]
},
"rgblight": {
+ "led_count": 13,
"sleep": true
},
"ws2812": {
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index e94b19675f3..124818c58c9 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
index 9a2417f0393..1fca2d1aef7 100644
--- a/keyboards/yynmt/dozen0/info.json
+++ b/keyboards/yynmt/dozen0/info.json
@@ -8,6 +8,9 @@
"pid": "0xEA4F",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 2
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index f50a2c72c3a..124818c58c9 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json
index 4165c966bf4..cd5541fbfa5 100644
--- a/keyboards/yynmt/kagamidget/info.json
+++ b/keyboards/yynmt/kagamidget/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index eecce57fe6a..7e6e359cc98 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
/* RGB light config */
-#define RGBLED_NUM 4
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index 02c40f61257..ac957c413c2 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -12,6 +12,9 @@
"cols": ["F1"],
"rows": ["F0"]
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "B6"
},
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index eff7fc2d491..3ef8f33a53a 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see .
#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
diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json
index 6d0df4a0c5f..f870c058c3f 100644
--- a/keyboards/zj68/info.json
+++ b/keyboards/zj68/info.json
@@ -16,6 +16,9 @@
"pin": "B6",
"levels": 5
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 8471167fcd9..401de718c15 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -16,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json
index 9f01b095185..71e126b687d 100644
--- a/keyboards/zlant/info.json
+++ b/keyboards/zlant/info.json
@@ -12,6 +12,9 @@
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"],
"rows": ["B0", "B1", "D4", "D5"]
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 310b4f57568..2585ea23dd6 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20
// SPI RGB Driver
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index ee3c3dfe478..8c02db11076 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -17,6 +17,9 @@
"pin": "A6",
"breathing": true
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index ca2efbedc29..2b4df581973 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -20,7 +20,6 @@
#define SPLIT_HAND_PIN B3
#define SELECT_SOFT_SERIAL_SPEED 0
-#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index a4265c688b3..880a12bf4ac 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -26,6 +26,7 @@
}
},
"rgblight": {
+ "led_count": 24,
"split_count": [12, 12]
},
"ws2812": {
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index e18d3bfb999..9a46bbcc8ef 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -21,7 +21,6 @@
//#define SELECT_SOFT_SERIAL_SPEED 0
#define SERIAL_USART_SPEED 921600
-#define RGBLED_NUM 48
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index b0536d92848..d804d9ff445 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -23,6 +23,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 48,
"max_brightness": 120,
"split_count": [24, 24]
},
diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h
index 92fdcaa5869..0f24dfe7e35 100644
--- a/keyboards/zykrah/fuyu/config.h
+++ b/keyboards/zykrah/fuyu/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
/* The number of LEDs connected (7 Snowflake, 34 Underglow) */
#define DRIVER_LED_TOTAL 41
-#define RGBLED_NUM 41
#define RGB_MATRIX_LED_COUNT 41
/* Caps locks LED index default is 0 (LED1 on PCB) */