From 2ea05cb0c5d7ad61ff21241d1d9cb240e033dcdd Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 12 Dec 2023 15:30:08 +1100 Subject: [PATCH] Rename `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` (#22570) --- data/mappings/info_config.hjson | 2 +- docs/config_options.md | 2 +- docs/feature_rgblight.md | 56 +++++++++---------- docs/hardware_keyboard_guidelines.md | 4 +- drivers/led/apa102.h | 6 +- drivers/ws2812.h | 6 +- keyboards/1k/keymaps/default/rgblite.h | 4 +- keyboards/25keys/zinc/rev1/post_config.h | 20 +++---- keyboards/25keys/zinc/reva/post_config.h | 20 +++---- keyboards/acheron/themis/87h/config.h | 2 - keyboards/acheron/themis/87h/info.json | 3 + keyboards/acheron/themis/87htsc/config.h | 2 - keyboards/acheron/themis/87htsc/info.json | 3 + keyboards/acheron/themis/88htsc/config.h | 2 - keyboards/acheron/themis/88htsc/info.json | 3 + keyboards/arabica37/keymaps/default/config.h | 4 +- .../ergo42/keymaps/default-underglow/config.h | 4 +- keyboards/dm9records/ergoinu/config.h | 2 +- keyboards/duck/jetfire/indicator_leds.h | 2 +- keyboards/duck/jetfire/jetfire.c | 8 +-- keyboards/ergodox_ez/led_i2c.c | 2 +- keyboards/ergodox_ez/post_config.h | 4 +- keyboards/ergotravel/keymaps/default/config.h | 4 +- keyboards/ergotravel/keymaps/via/config.h | 4 +- keyboards/fc660c/keymaps/default_rgb/config.h | 2 +- keyboards/fc660c/keymaps/via_rgb/config.h | 2 +- keyboards/foxlab/key65/universal/readme.md | 2 +- .../keymaps/default_giabarinaix2/config.h | 4 +- .../keymaps/via_giabarinaix2/config.h | 4 +- .../j73gl/keymaps/via_rgb_matrix/config.h | 4 +- .../handwired/chiron/keymaps/default/config.h | 4 +- .../freoduo/keymaps/default/keymap.c | 2 +- .../handwired/onekey/keymaps/apa102/config.h | 2 +- keyboards/helix/pico/config.h | 8 +-- keyboards/helix/rev2/config.h | 8 +-- keyboards/hineybush/hbcp/hbcp.c | 2 +- keyboards/ibm/model_m/mschwingen/mschwingen.c | 10 ++-- keyboards/jian/nsrev2/config.h | 4 +- keyboards/jian/rev1/post_config.h | 4 +- keyboards/jian/rev2/post_config.h | 4 +- .../gskt00/keymaps/default-poly/config.h | 2 +- keyboards/kc60/mod_rgb_underglow.md | 4 +- .../keebio/viterbi/keymaps/default/config.h | 4 +- keyboards/lets_split/keymaps/via/config.h | 4 +- keyboards/lily58/keymaps/default/config.h | 8 +-- keyboards/lily58/keymaps/via/config.h | 4 +- .../launchpad/keymaps/default_rgb/config.h | 2 +- keyboards/marksard/treadstone48/rev1/config.h | 4 +- keyboards/matrix/noah/noah.c | 10 ++-- keyboards/miiiw/blackio83/rev_0100/config.h | 1 - keyboards/miiiw/blackio83/rev_0100/rev_0100.c | 17 ------ keyboards/mixi/keymaps/default/keymap.c | 6 +- keyboards/mixi/keymaps/via/keymap.c | 6 +- keyboards/mlego/m48/keymaps/default/keymap.c | 8 +-- keyboards/mlego/m48/keymaps/via/keymap.c | 8 +-- keyboards/mlego/m60/keymaps/default/keymap.c | 8 +-- keyboards/mlego/m60/keymaps/via/keymap.c | 8 +-- .../mlego/m60_split/keymaps/default/keymap.c | 8 +-- .../mlego/m60_split/keymaps/via/keymap.c | 8 +-- keyboards/mlego/m65/m65.c | 8 +-- .../monstargear/xo87/solderable/solderable.h | 4 +- keyboards/neson_design/nico/nico.c | 6 +- keyboards/newgame40/post_config.h | 4 +- .../nullbitsco/nibble/keymaps/via/keymap.c | 2 +- keyboards/redox/keymaps/default/config.h | 4 +- keyboards/redox/keymaps/via/config.h | 4 +- .../reviung34/keymaps/default_rgb/config.h | 2 +- .../reviung34/keymaps/default_rgb2u/config.h | 2 +- .../reviung39/keymaps/default/config.h | 2 +- .../reviung39/keymaps/default_s/config.h | 2 +- .../reviung39/keymaps/default_s/readme.md | 2 +- .../reviung61/keymaps/default_rgb/config.h | 2 +- keyboards/rgbkb/sol/rev1/config.h | 6 +- keyboards/rgbkb/sol/rev2/config.h | 14 ++--- .../rgbkb/zen/rev1/keymaps/default/config.h | 4 +- keyboards/rgbkb/zygomorph/rev1/config.h | 4 +- .../keymaps/default_with_nafuda/config.h | 6 +- .../keymaps/default_with_setta21/config.h | 6 +- .../naked48/keymaps/via_rgb_matrix/config.h | 4 +- .../keymaps/default_with_setta21/config.h | 2 +- keyboards/silverbullet44/config.h | 2 +- keyboards/snes_macropad/snes_macropad.c | 2 +- keyboards/sofle/keymaps/rgb_default/config.h | 12 ++-- keyboards/sofle/keymaps/via/config.h | 4 +- keyboards/stront/config.h | 2 +- .../tunks/ergo33/keymaps/default/config.h | 2 +- keyboards/unison/keymaps/via/config.h | 4 +- keyboards/yosino58/keymaps/default/config.h | 4 +- quantum/rgblight/rgblight.c | 32 +++++------ quantum/rgblight/rgblight.h | 8 ++- 90 files changed, 254 insertions(+), 263 deletions(-) delete mode 100644 keyboards/miiiw/blackio83/rev_0100/rev_0100.c diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 26b437b51335..a323865fec4e 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -142,12 +142,12 @@ "RGB_MATRIX_DEFAULT_SPD": {"info_key": "rgb_matrix.default.speed", "value_type": "int"}, // RGBLight - "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"}, "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"}, "RGBLIGHT_HUE_STEP": {"info_key": "rgblight.hue_steps", "value_type": "int"}, "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"}, "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"}, "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"}, + "RGBLIGHT_LED_COUNT": {"info_key": "rgblight.led_count", "value_type": "int"}, "RGBLIGHT_LED_MAP": {"info_key": "rgblight.led_map", "value_type": "array.int"}, "RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"}, "RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"}, diff --git a/docs/config_options.md b/docs/config_options.md index 8119b9e356fa..bc28f603faca 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -223,7 +223,7 @@ If you define these options you will enable the associated feature, which may in * Adds ability to [blink](feature_rgblight.md?id=lighting-layer-blink) a lighting layer for a specified number of milliseconds (e.g. to acknowledge an action). * `#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF` * If defined, then [lighting layers](feature_rgblight?id=overriding-rgb-lighting-onoff-status) will be shown even if RGB Light is off. -* `#define RGBLED_NUM 12` +* `#define RGBLIGHT_LED_COUNT 12` * number of LEDs * `#define RGBLIGHT_SPLIT` * Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index 8a64454b0db5..b7ba0757317b 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -33,13 +33,13 @@ RGBLIGHT_DRIVER = apa102 At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these. -|Define |Description | -|---------------|-------------------------------------------------------------------------| -|`WS2812_DI_PIN`|The pin connected to the data pin of the LEDs (WS2812) | -|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102) | -|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102) | -|`RGBLED_NUM` |The number of LEDs connected | -|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half| +|Define |Description | +|--------------------|-------------------------------------------------------------------------| +|`WS2812_DI_PIN` |The pin connected to the data pin of the LEDs (WS2812) | +|`APA102_DI_PIN` |The pin connected to the data pin of the LEDs (APA102) | +|`APA102_CI_PIN` |The pin connected to the clock pin of the LEDs (APA102) | +|`RGBLIGHT_LED_COUNT`|The number of LEDs connected | +|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half| Then you should be able to use the keycodes below to change the RGB lighting to your liking. @@ -152,28 +152,28 @@ Use these defines to add or remove animations from the firmware. When you are ru The following options are used to tweak the various animations: -|Define |Default |Description | -|------------------------------------|-------------|-----------------------------------------------------------------------------------------------| -|`RGBLIGHT_EFFECT_BREATHE_CENTER` |*Not defined*|If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 | -|`RGBLIGHT_EFFECT_BREATHE_MAX` |`255` |The maximum brightness for the breathing mode. Valid values are 1 to 255 | -|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40` |How long (in milliseconds) to wait between animation steps for the "Christmas" animation | -|`RGBLIGHT_EFFECT_CHRISTMAS_STEP` |`2` |The number of LEDs to group the red/green colors by for the "Christmas" animation | -|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM` |`RGBLED_NUM` |The number of LEDs to have the "Knight" animation travel | -|`RGBLIGHT_EFFECT_KNIGHT_LENGTH` |`3` |The number of LEDs to light up for the "Knight" animation | -|`RGBLIGHT_EFFECT_KNIGHT_OFFSET` |`0` |The number of LEDs to start the "Knight" animation from the start of the strip by | -|`RGBLIGHT_RAINBOW_SWIRL_RANGE` |`255` |Range adjustment for the rainbow swirl effect to get different swirls | -|`RGBLIGHT_EFFECT_SNAKE_LENGTH` |`4` |The number of LEDs to light up for the "Snake" animation | -|`RGBLIGHT_EFFECT_TWINKLE_LIFE` |`200` |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps) | -|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127` |Adjusts how likely each LED is to twinkle (on each animation step) | +|Define |Default |Description | +|------------------------------------|--------------------|-----------------------------------------------------------------------------------------------| +|`RGBLIGHT_EFFECT_BREATHE_CENTER` |*Not defined* |If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 | +|`RGBLIGHT_EFFECT_BREATHE_MAX` |`255` |The maximum brightness for the breathing mode. Valid values are 1 to 255 | +|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40` |How long (in milliseconds) to wait between animation steps for the "Christmas" animation | +|`RGBLIGHT_EFFECT_CHRISTMAS_STEP` |`2` |The number of LEDs to group the red/green colors by for the "Christmas" animation | +|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM` |`RGBLIGHT_LED_COUNT`|The number of LEDs to have the "Knight" animation travel | +|`RGBLIGHT_EFFECT_KNIGHT_LENGTH` |`3` |The number of LEDs to light up for the "Knight" animation | +|`RGBLIGHT_EFFECT_KNIGHT_OFFSET` |`0` |The number of LEDs to start the "Knight" animation from the start of the strip by | +|`RGBLIGHT_RAINBOW_SWIRL_RANGE` |`255` |Range adjustment for the rainbow swirl effect to get different swirls | +|`RGBLIGHT_EFFECT_SNAKE_LENGTH` |`4` |The number of LEDs to light up for the "Snake" animation | +|`RGBLIGHT_EFFECT_TWINKLE_LIFE` |`200` |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps) | +|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127` |Adjusts how likely each LED is to twinkle (on each animation step) | ### Example Usage to Reduce Memory Footprint 1. Use `#undef` to selectively disable animations. The following would disable two animations and save about 4KiB: ```diff - #undef RGBLED_NUM + #undef RGBLIGHT_LED_COUNT +#undef RGBLIGHT_EFFECT_STATIC_GRADIENT +#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL - #define RGBLED_NUM 12 + #define RGBLIGHT_LED_COUNT 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 ``` @@ -386,10 +386,10 @@ rgblight_set(); // Utility functions do not call rgblight_set() automatically, s #### direct operation |Function |Description | |--------------------------------------------|-------------| -|`rgblight_setrgb_at(r, g, b, index)` |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) | -|`rgblight_sethsv_at(h, s, v, index)` |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) | -|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)| -|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)| +|`rgblight_setrgb_at(r, g, b, index)` |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) | +|`rgblight_sethsv_at(h, s, v, index)` |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) | +|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)| +|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)| |`rgblight_setrgb(r, g, b)` |Set effect range LEDs to the given RGB value where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) | |`rgblight_setrgb_master(r, g, b)` |Set the LEDs on the master side to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) | |`rgblight_setrgb_slave(r, g, b)` |Set the LEDs on the slave side to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) | @@ -519,7 +519,7 @@ By defining `RGBLIGHT_LED_MAP` as in the example below, you can specify the LED ```c // config.h -#define RGBLED_NUM 4 +#define RGBLIGHT_LED_COUNT 4 #define RGBLIGHT_LED_MAP { 3, 2, 1, 0 } ``` @@ -541,7 +541,7 @@ In addition to setting the Clipping Range, you can use `RGBLIGHT_LED_MAP` togeth ```c // config.h -#define RGBLED_NUM 8 +#define RGBLIGHT_LED_COUNT 8 #define RGBLIGHT_LED_MAP { 7, 6, 5, 4, 3, 2, 1, 0 } // some source diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md index fb434e157652..684ccc73f681 100644 --- a/docs/hardware_keyboard_guidelines.md +++ b/docs/hardware_keyboard_guidelines.md @@ -169,11 +169,11 @@ The `post_rules.mk` file can interpret `features` of a keyboard-level before `co ifeq ($(strip $(RGBLED_OPTION_TYPE)),backlight) RGBLIGHT_ENABLE = yes - OPT_DEFS += -DRGBLED_NUM=30 + OPT_DEFS += -DRGBLIGHT_LED_COUNT=30 endif ifeq ($(strip $(RGBLED_OPTION_TYPE)),underglow) RGBLIGHT_ENABLE = yes - OPT_DEFS += -DRGBLED_NUM=6 + OPT_DEFS += -DRGBLIGHT_LED_COUNT=6 endif ``` diff --git a/drivers/led/apa102.h b/drivers/led/apa102.h index 027221f434d9..e3b269883df5 100644 --- a/drivers/led/apa102.h +++ b/drivers/led/apa102.h @@ -19,9 +19,9 @@ #include "color.h" -#if defined(RGBLED_NUM) -# define APA102_LED_COUNT RGBLED_NUM -#elif defined(RGB_MATRIX_LED_COUNT) +#if defined(RGBLIGHT_APA102) +# define APA102_LED_COUNT RGBLIGHT_LED_COUNT +#elif defined(RGB_MATRIX_APA102) # define APA102_LED_COUNT RGB_MATRIX_LED_COUNT #endif diff --git a/drivers/ws2812.h b/drivers/ws2812.h index 1527df23d371..134de51c5039 100644 --- a/drivers/ws2812.h +++ b/drivers/ws2812.h @@ -56,9 +56,9 @@ # define WS2812_TRST_US 280 #endif -#if defined(RGBLED_NUM) -# define WS2812_LED_COUNT RGBLED_NUM -#elif defined(RGB_MATRIX_LED_COUNT) +#if defined(RGBLIGHT_WS2812) +# define WS2812_LED_COUNT RGBLIGHT_LED_COUNT +#elif defined(RGB_MATRIX_WS2812) # define WS2812_LED_COUNT RGB_MATRIX_LED_COUNT #endif diff --git a/keyboards/1k/keymaps/default/rgblite.h b/keyboards/1k/keymaps/default/rgblite.h index 29d684ac0815..9a7761e30de6 100644 --- a/keyboards/1k/keymaps/default/rgblite.h +++ b/keyboards/1k/keymaps/default/rgblite.h @@ -7,8 +7,8 @@ #include "color.h" static inline void rgblite_setrgb(RGB rgb) { - rgb_led_t leds[RGBLED_NUM] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}}; - ws2812_setleds(leds, RGBLED_NUM); + rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}}; + ws2812_setleds(leds, RGBLIGHT_LED_COUNT); } static void rgblite_increase_hue(void) { diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h index 3d51de9e4c16..42d2d7e46c8b 100644 --- a/keyboards/25keys/zinc/rev1/post_config.h +++ b/keyboards/25keys/zinc/rev1/post_config.h @@ -24,35 +24,35 @@ along with this program. If not, see . #define RGBLIGHT_SPLIT #ifdef RGBLED_BACK #ifdef RGBLED_CONT - #define RGBLED_NUM 48 + #define RGBLIGHT_LED_COUNT 48 #define RGBLED_SPLIT { 24, 24 } #else - #define RGBLED_NUM 24 + #define RGBLIGHT_LED_COUNT 24 #endif #else #ifdef RGBLED_BOTH #ifdef RGBLED_CONT - #define RGBLED_NUM 60 + #define RGBLIGHT_LED_COUNT 60 #define RGBLED_SPLIT { 30, 30 } #else - #define RGBLED_NUM 30 + #define RGBLIGHT_LED_COUNT 30 #endif #else #ifdef RGBLED_CONT - #define RGBLED_NUM 12 + #define RGBLIGHT_LED_COUNT 12 #define RGBLED_SPLIT { 6, 6 } #else - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif #endif #endif #endif #ifndef IOS_DEVICE_ENABLE - #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) + #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12)) #define RGBLIGHT_LIMIT_VAL 255 #else - #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) + #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32)) #define RGBLIGHT_LIMIT_VAL 130 #else #define RGBLIGHT_LIMIT_VAL 120 @@ -60,10 +60,10 @@ along with this program. If not, see . #endif #define RGBLIGHT_VAL_STEP 17 #else - #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) + #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12)) #define RGBLIGHT_LIMIT_VAL 90 #else - #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) + #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32)) #define RGBLIGHT_LIMIT_VAL 45 #else #define RGBLIGHT_LIMIT_VAL 35 diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h index 3d51de9e4c16..42d2d7e46c8b 100644 --- a/keyboards/25keys/zinc/reva/post_config.h +++ b/keyboards/25keys/zinc/reva/post_config.h @@ -24,35 +24,35 @@ along with this program. If not, see . #define RGBLIGHT_SPLIT #ifdef RGBLED_BACK #ifdef RGBLED_CONT - #define RGBLED_NUM 48 + #define RGBLIGHT_LED_COUNT 48 #define RGBLED_SPLIT { 24, 24 } #else - #define RGBLED_NUM 24 + #define RGBLIGHT_LED_COUNT 24 #endif #else #ifdef RGBLED_BOTH #ifdef RGBLED_CONT - #define RGBLED_NUM 60 + #define RGBLIGHT_LED_COUNT 60 #define RGBLED_SPLIT { 30, 30 } #else - #define RGBLED_NUM 30 + #define RGBLIGHT_LED_COUNT 30 #endif #else #ifdef RGBLED_CONT - #define RGBLED_NUM 12 + #define RGBLIGHT_LED_COUNT 12 #define RGBLED_SPLIT { 6, 6 } #else - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif #endif #endif #endif #ifndef IOS_DEVICE_ENABLE - #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) + #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12)) #define RGBLIGHT_LIMIT_VAL 255 #else - #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) + #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32)) #define RGBLIGHT_LIMIT_VAL 130 #else #define RGBLIGHT_LIMIT_VAL 120 @@ -60,10 +60,10 @@ along with this program. If not, see . #endif #define RGBLIGHT_VAL_STEP 17 #else - #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) + #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12)) #define RGBLIGHT_LIMIT_VAL 90 #else - #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) + #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32)) #define RGBLIGHT_LIMIT_VAL 45 #else #define RGBLIGHT_LIMIT_VAL 35 diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h index 605594eea209..ed1229c77933 100644 --- a/keyboards/acheron/themis/87h/config.h +++ b/keyboards/acheron/themis/87h/config.h @@ -20,8 +20,6 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGBLED_NUM 1 - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json index cbff8f4eec55..0ef52a61a053 100644 --- a/keyboards/acheron/themis/87h/info.json +++ b/keyboards/acheron/themis/87h/info.json @@ -26,6 +26,9 @@ "backing_size": 8192 } }, + "rgblight": { + "led_count": 1 + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h index 605594eea209..ed1229c77933 100644 --- a/keyboards/acheron/themis/87htsc/config.h +++ b/keyboards/acheron/themis/87htsc/config.h @@ -20,8 +20,6 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGBLED_NUM 1 - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json index 5b491690bbc2..75c680d2a422 100644 --- a/keyboards/acheron/themis/87htsc/info.json +++ b/keyboards/acheron/themis/87htsc/info.json @@ -26,6 +26,9 @@ "backing_size": 8192 } }, + "rgblight": { + "led_count": 1 + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h index 605594eea209..ed1229c77933 100644 --- a/keyboards/acheron/themis/88htsc/config.h +++ b/keyboards/acheron/themis/88htsc/config.h @@ -20,8 +20,6 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGBLED_NUM 1 - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json index 073a16e94616..8726642c0c45 100644 --- a/keyboards/acheron/themis/88htsc/info.json +++ b/keyboards/acheron/themis/88htsc/info.json @@ -26,6 +26,9 @@ "backing_size": 8192 } }, + "rgblight": { + "led_count": 1 + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/arabica37/keymaps/default/config.h b/keyboards/arabica37/keymaps/default/config.h index 57ce4cc0c187..5654f4daf4bb 100644 --- a/keyboards/arabica37/keymaps/default/config.h +++ b/keyboards/arabica37/keymaps/default/config.h @@ -31,7 +31,7 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 170 -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -42,7 +42,7 @@ 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_LED_COUNT 50 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h index a56bd0f2e72e..2469b627e266 100644 --- a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h +++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h @@ -27,8 +27,8 @@ along with this program. If not, see . // #define EE_HANDS // Underglow -#undef RGBLED_NUM -#define RGBLED_NUM 14 // Number of LEDs +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index d1c1201a5488..b6a3484a2604 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . // #define EE_HANDS #ifndef IOS_DEVICE_ENABLE - #if RGBLED_NUM <= 7 + #if RGBLIGHT_LED_COUNT <= 7 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_VAL_STEP 17 #endif diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h index d94709d1cb1a..36dda632fbc4 100644 --- a/keyboards/duck/jetfire/indicator_leds.h +++ b/keyboards/duck/jetfire/indicator_leds.h @@ -6,6 +6,6 @@ void backlight_init_ports(void); void backlight_set_state(bool cfg[7]); void backlight_update_state(void); void backlight_toggle_rgb(bool enabled); -void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3]); +void backlight_set_rgb(uint8_t cfg[RGBLIGHT_LED_COUNT][3]); void backlight_set(uint8_t level); void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device); diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c index 23e6e9095a5c..45a46766fd61 100644 --- a/keyboards/duck/jetfire/jetfire.c +++ b/keyboards/duck/jetfire/jetfire.c @@ -44,10 +44,10 @@ uint8_t backlight_state_led = 1<= half_led_num; --i) # elif defined(ERGODOX_LED_15_MIRROR) for (i = 0; i < led_num; ++i) diff --git a/keyboards/ergodox_ez/post_config.h b/keyboards/ergodox_ez/post_config.h index 0d4fe5c6832b..eb22439ae4fd 100644 --- a/keyboards/ergodox_ez/post_config.h +++ b/keyboards/ergodox_ez/post_config.h @@ -33,8 +33,8 @@ along with this program. If not, see . #ifdef ERGODOX_LED_30 // If using 30 LEDs, then define that many -# define RGBLED_NUM 30 // Number of LEDs +# define RGBLIGHT_LED_COUNT 30 // Number of LEDs #else // If not, then only define 15 -# define RGBLED_NUM 15 // Number of LEDs +# define RGBLIGHT_LED_COUNT 15 // Number of LEDs #endif diff --git a/keyboards/ergotravel/keymaps/default/config.h b/keyboards/ergotravel/keymaps/default/config.h index d047f718d67c..746e60da5a55 100644 --- a/keyboards/ergotravel/keymaps/default/config.h +++ b/keyboards/ergotravel/keymaps/default/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +34,7 @@ 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_LED_COUNT 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ergotravel/keymaps/via/config.h b/keyboards/ergotravel/keymaps/via/config.h index 409e3efde45e..d42b738adc10 100644 --- a/keyboards/ergotravel/keymaps/via/config.h +++ b/keyboards/ergotravel/keymaps/via/config.h @@ -23,8 +23,8 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -// #undef RGBLED_NUM -// #define RGBLED_NUM 14 +// #undef RGBLIGHT_LED_COUNT +// #define RGBLIGHT_LED_COUNT 14 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 // #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h index 23745f319030..1953964f88d5 100644 --- a/keyboards/fc660c/keymaps/default_rgb/config.h +++ b/keyboards/fc660c/keymaps/default_rgb/config.h @@ -21,7 +21,7 @@ /*RGB*/ /*Repurpose Insert LED */ #define WS2812_DI_PIN B5 - #define RGBLED_NUM 16 + #define RGBLIGHT_LED_COUNT 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h index 23745f319030..1953964f88d5 100644 --- a/keyboards/fc660c/keymaps/via_rgb/config.h +++ b/keyboards/fc660c/keymaps/via_rgb/config.h @@ -21,7 +21,7 @@ /*RGB*/ /*Repurpose Insert LED */ #define WS2812_DI_PIN B5 - #define RGBLED_NUM 16 + #define RGBLIGHT_LED_COUNT 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/key65/universal/readme.md b/keyboards/foxlab/key65/universal/readme.md index 967b9565f24a..36f63b1abaf1 100644 --- a/keyboards/foxlab/key65/universal/readme.md +++ b/keyboards/foxlab/key65/universal/readme.md @@ -19,4 +19,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## RGB LED support -The universal PCB supports RGB LEDs as an LED strip, but is not supplied with one. To use RGB LEDs, you should configure the RGBLED_NUM to match the number of LEDs on your strip. +The universal PCB supports RGB LEDs as an LED strip, but is not supplied with one. To use RGB LEDs, you should configure the RGBLIGHT_LED_COUNT to match the number of LEDs on your strip. diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h index dd10d213a0b6..01ad55eec0f5 100644 --- a/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h +++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h @@ -22,8 +22,8 @@ along with this program. If not, see . # undef MATRIX_COL_PINS_RIGHT # ifdef RGBLIGHT_ENABLE -# undef RGBLED_NUM -# define RGBLED_NUM 120 +# undef RGBLIGHT_LED_COUNT +# define RGBLIGHT_LED_COUNT 120 # undef RGBLIGHT_LED_MAP # define RGBLIGHT_LED_MAP { \ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \ diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h index 01905b8dfec3..decc2e2dc189 100644 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h +++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h @@ -7,8 +7,8 @@ # undef MATRIX_COL_PINS_RIGHT # ifdef RGBLIGHT_ENABLE -# undef RGBLED_NUM -# define RGBLED_NUM 120 +# undef RGBLIGHT_LED_COUNT +# define RGBLIGHT_LED_COUNT 120 # undef RGBLIGHT_LED_MAP # define RGBLIGHT_LED_MAP { \ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \ diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h index 0f71fedd0ec8..b3970ff04a1c 100644 --- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h +++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h @@ -21,8 +21,8 @@ #define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 -#ifdef RGBLED_NUM - #undef RGBLED_NUM +#ifdef RGBLIGHT_LED_COUNT + #undef RGBLIGHT_LED_COUNT #endif #define RGB_MATRIX_LED_COUNT 73 diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h index c373743a39c0..5d8a8a083dac 100644 --- a/keyboards/handwired/chiron/keymaps/default/config.h +++ b/keyboards/handwired/chiron/keymaps/default/config.h @@ -30,8 +30,8 @@ #define MOUSEKEY_WHEEL_MAX_SPEED 8 #define MOUSEKEY_WHEEL_TIME_TO_MAX 40 -#undef RGBLED_NUM -#define RGBLED_NUM 2 +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT 2 #define RGBLED_SPLIT {1, 1} // Don't turn off lights when the host goes to sleep. diff --git a/keyboards/handwired/freoduo/keymaps/default/keymap.c b/keyboards/handwired/freoduo/keymaps/default/keymap.c index bd01de7585f3..791e6af318d2 100644 --- a/keyboards/handwired/freoduo/keymaps/default/keymap.c +++ b/keyboards/handwired/freoduo/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {0, 7, 0}, {7, 24, HSV_RED}, - {24, RGBLED_NUM, 0} + {24, RGBLIGHT_LED_COUNT, 0} ); // Light all LEDs in green when keyboard layer 1 is active const rgblight_segment_t PROGMEM layer_lower[] = RGBLIGHT_LAYER_SEGMENTS( diff --git a/keyboards/handwired/onekey/keymaps/apa102/config.h b/keyboards/handwired/onekey/keymaps/apa102/config.h index 756ebb359366..bb618d77fbc3 100644 --- a/keyboards/handwired/onekey/keymaps/apa102/config.h +++ b/keyboards/handwired/onekey/keymaps/apa102/config.h @@ -1,6 +1,6 @@ #pragma once -#define RGBLED_NUM 40 +#define RGBLIGHT_LED_COUNT 40 #define APA102_DEFAULT_BRIGHTNESS 5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h index f5eb4c13e101..e1cd9c2e9093 100644 --- a/keyboards/helix/pico/config.h +++ b/keyboards/helix/pico/config.h @@ -50,20 +50,20 @@ along with this program. If not, see . // Helix keyboard RGB LED support // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes #ifdef RGBLED_BACK - #define RGBLED_NUM 25 + #define RGBLIGHT_LED_COUNT 25 #else - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif #ifndef IOS_DEVICE_ENABLE - #if RGBLED_NUM <= 6 + #if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 255 #else #define RGBLIGHT_LIMIT_VAL 130 #endif #define RGBLIGHT_VAL_STEP 17 #else - #if RGBLED_NUM <= 6 + #if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 90 #else #define RGBLIGHT_LIMIT_VAL 45 diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index 7ab494522a80..8af2a44ecc7f 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h @@ -31,20 +31,20 @@ along with this program. If not, see . // Helix keyboard RGB LED support // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes #ifdef RGBLED_BACK - #define RGBLED_NUM 32 + #define RGBLIGHT_LED_COUNT 32 #else - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif #ifndef IOS_DEVICE_ENABLE - #if RGBLED_NUM <= 6 + #if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 255 #else #define RGBLIGHT_LIMIT_VAL 120 #endif #define RGBLIGHT_VAL_STEP 17 #else - #if RGBLED_NUM <= 6 + #if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 90 #else #define RGBLIGHT_LIMIT_VAL 35 diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c index df17650f27fc..754b63b20094 100644 --- a/keyboards/hineybush/hbcp/hbcp.c +++ b/keyboards/hineybush/hbcp/hbcp.c @@ -70,7 +70,7 @@ bool led_update_kb(led_t led_state) { __attribute__ ((weak)) void keyboard_post_init_user(void) { - rgblight_set_effect_range(3, RGBLED_NUM-3); + rgblight_set_effect_range(3, RGBLIGHT_LED_COUNT-3); led_t led_state = { .caps_lock = true, .num_lock = true, diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c index 8e3810cd234f..03dfcdc2f2c6 100644 --- a/keyboards/ibm/model_m/mschwingen/mschwingen.c +++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c @@ -36,10 +36,10 @@ static bool blink_state = false; static uint8_t isRecording = 0; #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 -# if RGBLED_NUM < 3 +# if RGBLIGHT_LED_COUNT < 3 # error we need at least 3 RGB LEDs! # endif -static rgb_led_t led[RGBLED_NUM] = {{255, 255, 255}, {255, 255, 255}, {255, 255, 255}}; +static rgb_led_t led[RGBLIGHT_LED_COUNT] = {{255, 255, 255}, {255, 255, 255}, {255, 255, 255}}; # define BRIGHT 32 # define DIM 6 @@ -84,13 +84,13 @@ void sleep_led_enable(void) { led[0] = black; led[1] = black; led[2] = black; - ws2812_setleds(led, RGBLED_NUM); + ws2812_setleds(led, RGBLIGHT_LED_COUNT); #endif } void keyboard_pre_init_kb(void) { #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 - ws2812_setleds(led, RGBLED_NUM); + ws2812_setleds(led, RGBLIGHT_LED_COUNT); #else /* Set status LEDs pins to output and Low (on) */ setPinOutput(MODELM_LED_CAPSLOCK); @@ -146,7 +146,7 @@ static void led_update_rgb(void) { break; } if (!suspend_active) { - ws2812_setleds(led, RGBLED_NUM); + ws2812_setleds(led, RGBLIGHT_LED_COUNT); } } diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 5025847259a8..7df400367fcf 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -22,14 +22,14 @@ along with this program. If not, see . #define RGBLIGHT_TIMER #ifndef IOS_DEVICE_ENABLE -#if RGBLED_NUM <= 6 +#if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 255 #else #define RGBLIGHT_LIMIT_VAL 130 #endif #define RGBLIGHT_VAL_STEP 8 #else -#if RGBLED_NUM <= 6 +#if RGBLIGHT_LED_COUNT <= 6 #define RGBLIGHT_LIMIT_VAL 90 #else #define RGBLIGHT_LIMIT_VAL 45 diff --git a/keyboards/jian/rev1/post_config.h b/keyboards/jian/rev1/post_config.h index fade065e1923..935d0d1f015c 100644 --- a/keyboards/jian/rev1/post_config.h +++ b/keyboards/jian/rev1/post_config.h @@ -1,14 +1,14 @@ #pragma once #ifndef IOS_DEVICE_ENABLE -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 255 # else # define RGBLIGHT_LIMIT_VAL 130 # endif # define RGBLIGHT_VAL_STEP 8 #else -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 90 # else # define RGBLIGHT_LIMIT_VAL 45 diff --git a/keyboards/jian/rev2/post_config.h b/keyboards/jian/rev2/post_config.h index fade065e1923..935d0d1f015c 100644 --- a/keyboards/jian/rev2/post_config.h +++ b/keyboards/jian/rev2/post_config.h @@ -1,14 +1,14 @@ #pragma once #ifndef IOS_DEVICE_ENABLE -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 255 # else # define RGBLIGHT_LIMIT_VAL 130 # endif # define RGBLIGHT_VAL_STEP 8 #else -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 90 # else # define RGBLIGHT_LIMIT_VAL 45 diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h index 64135cabcdc5..40a7c6ec47e7 100644 --- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h +++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h @@ -30,7 +30,7 @@ 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_LED_COUNT 14 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 diff --git a/keyboards/kc60/mod_rgb_underglow.md b/keyboards/kc60/mod_rgb_underglow.md index 6aab1e1d2e6c..22ade4fa1b5e 100644 --- a/keyboards/kc60/mod_rgb_underglow.md +++ b/keyboards/kc60/mod_rgb_underglow.md @@ -9,8 +9,8 @@ By default, the source is set up for 16 LEDs on the F5 breakout pin. See [includ ```c #pragma once -#undef RGBLED_NUM -#define RGBLED_NUM +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT ``` To enable RGB Underglow, simply add a `rules.mk` file containing `RGBLIGHT_ENABLE = yes` alongside your `keymap.c` file, and compile as normal: diff --git a/keyboards/keebio/viterbi/keymaps/default/config.h b/keyboards/keebio/viterbi/keymaps/default/config.h index 38c399ff2c24..acc5970dcb5a 100644 --- a/keyboards/keebio/viterbi/keymaps/default/config.h +++ b/keyboards/keebio/viterbi/keymaps/default/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +35,7 @@ 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_LED_COUNT 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/lets_split/keymaps/via/config.h b/keyboards/lets_split/keymaps/via/config.h index a676d6826d05..03853dc39194 100644 --- a/keyboards/lets_split/keymaps/via/config.h +++ b/keyboards/lets_split/keymaps/via/config.h @@ -31,7 +31,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -42,6 +42,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_LED_COUNT 10 #define NO_MUSIC_MODE diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h index b16e63b6d7ac..5b45770f38f1 100644 --- a/keyboards/lily58/keymaps/default/config.h +++ b/keyboards/lily58/keymaps/default/config.h @@ -29,7 +29,7 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,7 +40,7 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 27 +#define RGBLIGHT_LED_COUNT 27 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 @@ -48,7 +48,7 @@ along with this program. If not, see . // Underglow /* -#undef RGBLED_NUM -#define RGBLED_NUM 14 // Number of LEDs +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT 14 // Number of LEDs #define RGBLIGHT_SLEEP */ diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h index 331521bcbfa9..284d3944b96d 100644 --- a/keyboards/lily58/keymaps/via/config.h +++ b/keyboards/lily58/keymaps/via/config.h @@ -33,7 +33,7 @@ along with this program. If not, see . // Underglow /* -#undef RGBLED_NUM -#define RGBLED_NUM 14 // Number of LEDs +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT 14 // Number of LEDs #define RGBLIGHT_SLEEP */ diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h index 3d47ae41e763..c50e0103757b 100644 --- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h @@ -12,7 +12,7 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 2 // Number of LEDs +#define RGBLIGHT_LED_COUNT 2 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index 3f43b16d2be3..66007ee2ef4d 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h @@ -18,10 +18,10 @@ along with this program. If not, see . #pragma once #ifndef RS_EXTRA_LED - #define RGBLED_NUM 12 + #define RGBLIGHT_LED_COUNT 12 #define RGBLED_SPLIT {12, 0} #else - #define RGBLED_NUM 32 + #define RGBLIGHT_LED_COUNT 32 #define RGBLED_SPLIT {12, 20} #endif diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c index 35a55d03b696..d62177a2f43c 100644 --- a/keyboards/matrix/noah/noah.c +++ b/keyboards/matrix/noah/noah.c @@ -17,15 +17,15 @@ extern rgblight_config_t rgblight_config; // led 0 for caps lock, led 1 for scroll lock, led 3 for num lock // led 4 for layer 1, led 5 for layer 2, led 6 for layer 3, led 7 for layer 4 -#if RGBLED_NUM < 7 -#error "MUST set the RGBLED_NUM bigger than 7" +#if RGBLIGHT_LED_COUNT < 7 +#error "MUST set the RGBLIGHT_LED_COUNT bigger than 7" #endif -rgb_led_t noah_leds[RGBLED_NUM]; +rgb_led_t noah_leds[RGBLIGHT_LED_COUNT]; static bool noah_led_mode = false; void setleds_custom(rgb_led_t *ledarray, uint16_t num_leds) { memset(&noah_leds[0], 0, sizeof(noah_leds)); if (!rgblight_config.enable) { - for (uint8_t i = 0; i < RGBLED_NUM; i++) { + for (uint8_t i = 0; i < RGBLIGHT_LED_COUNT; i++) { ledarray[i].r = 0; ledarray[i].g = 0; ledarray[i].b = 0; @@ -51,7 +51,7 @@ void setleds_custom(rgb_led_t *ledarray, uint16_t num_leds) { memcpy(&noah_leds[0], &ledarray[0], sizeof(noah_leds)); } - ws2812_setleds(noah_leds, RGBLED_NUM); + ws2812_setleds(noah_leds, RGBLIGHT_LED_COUNT); } const rgblight_driver_t rgblight_driver = { diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h index e68a9d0b163d..78f7739f0aba 100644 --- a/keyboards/miiiw/blackio83/rev_0100/config.h +++ b/keyboards/miiiw/blackio83/rev_0100/config.h @@ -36,7 +36,6 @@ /* RGB Matrix config */ #define RGB_EN_PIN A8 -#define RGBLED_NUM 83 #define RGB_MATRIX_LED_COUNT 83 #define RGB_MATRIX_CENTER { 62, 42 } diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c deleted file mode 100644 index b28ac84acb41..000000000000 --- a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 ArthurCyy - * - * 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 . - */ - -#include "blackio83.h" diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c index d14a692a8980..29f19349cc05 100644 --- a/keyboards/mixi/keymaps/default/keymap.c +++ b/keyboards/mixi/keymaps/default/keymap.c @@ -59,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_BLUE} + {0, RGBLIGHT_LED_COUNT, HSV_BLUE} ); const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_GREEN} + {0, RGBLIGHT_LED_COUNT, HSV_GREEN} ); const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_RED} + {0, RGBLIGHT_LED_COUNT, HSV_RED} ); const rgblight_segment_t* const PROGMEM _rgb_layers[] = diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c index ef5aace88899..adcf44850388 100644 --- a/keyboards/mixi/keymaps/via/keymap.c +++ b/keyboards/mixi/keymaps/via/keymap.c @@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_BLUE} + {0, RGBLIGHT_LED_COUNT, HSV_BLUE} ); const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_GREEN} + {0, RGBLIGHT_LED_COUNT, HSV_GREEN} ); const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_RED} + {0, RGBLIGHT_LED_COUNT, HSV_RED} ); const rgblight_segment_t* const PROGMEM _rgb_layers[] = diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c index d07f19352660..71409bf939e4 100644 --- a/keyboards/mlego/m48/keymaps/default/keymap.c +++ b/keyboards/mlego/m48/keymaps/default/keymap.c @@ -26,10 +26,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c index 91649631dc34..d180c3e8ac12 100644 --- a/keyboards/mlego/m48/keymaps/via/keymap.c +++ b/keyboards/mlego/m48/keymaps/via/keymap.c @@ -26,10 +26,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m60/keymaps/default/keymap.c b/keyboards/mlego/m60/keymaps/default/keymap.c index dbfcad315254..d997bd2dc062 100644 --- a/keyboards/mlego/m60/keymaps/default/keymap.c +++ b/keyboards/mlego/m60/keymaps/default/keymap.c @@ -26,10 +26,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m60/keymaps/via/keymap.c b/keyboards/mlego/m60/keymaps/via/keymap.c index 8d0cddae80ff..fc3ab612d098 100644 --- a/keyboards/mlego/m60/keymaps/via/keymap.c +++ b/keyboards/mlego/m60/keymaps/via/keymap.c @@ -26,10 +26,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m60_split/keymaps/default/keymap.c b/keyboards/mlego/m60_split/keymaps/default/keymap.c index 2f51794c1c7c..506aa45f300f 100644 --- a/keyboards/mlego/m60_split/keymaps/default/keymap.c +++ b/keyboards/mlego/m60_split/keymaps/default/keymap.c @@ -29,10 +29,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m60_split/keymaps/via/keymap.c b/keyboards/mlego/m60_split/keymaps/via/keymap.c index 756639bfd9c3..29270b0425bd 100644 --- a/keyboards/mlego/m60_split/keymaps/via/keymap.c +++ b/keyboards/mlego/m60_split/keymaps/via/keymap.c @@ -29,10 +29,10 @@ enum layer_names { #ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_GREEN}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); #endif diff --git a/keyboards/mlego/m65/m65.c b/keyboards/mlego/m65/m65.c index 12ea866f1e52..506ac2e30d9f 100644 --- a/keyboards/mlego/m65/m65.c +++ b/keyboards/mlego/m65/m65.c @@ -9,10 +9,10 @@ static bool toggle_rse = false; #if defined(RGBLIGHT_ENABLE) -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_OFF}); -const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_AZURE}); -const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CORAL}); -const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED}); +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_OFF}); +const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_AZURE}); +const rgblight_segment_t PROGMEM my_rse_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CORAL}); +const rgblight_segment_t PROGMEM my_adj_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED}); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer); diff --git a/keyboards/monstargear/xo87/solderable/solderable.h b/keyboards/monstargear/xo87/solderable/solderable.h index 2758a3a3ffc3..70e8a6c8d5e8 100644 --- a/keyboards/monstargear/xo87/solderable/solderable.h +++ b/keyboards/monstargear/xo87/solderable/solderable.h @@ -43,11 +43,11 @@ typedef struct{ rgb_; #define colorAGSize 10 -#define colorBGSize RGBLED_NUM-10 +#define colorBGSize RGBLIGHT_LED_COUNT-10 typedef struct{ rgb_ colorAG[colorAGSize]; - rgb_ colorBG[RGBLED_NUM-10]; + rgb_ colorBG[RGBLIGHT_LED_COUNT-10]; } backLedRgbG_; diff --git a/keyboards/neson_design/nico/nico.c b/keyboards/neson_design/nico/nico.c index 5d84cb9e1bea..bf8eeb87dd3b 100644 --- a/keyboards/neson_design/nico/nico.c +++ b/keyboards/neson_design/nico/nico.c @@ -54,14 +54,14 @@ void housekeeping_task_kb(void) alert = !alert; last_ticks = timer_read(); } - ws2812_setleds(led, RGBLED_NUM); + ws2812_setleds(led, RGBLIGHT_LED_COUNT); } else { if (backup) { led[4].r = caps_led.r; led[4].g = caps_led.g; led[4].b = caps_led.b; backup = false; - ws2812_setleds(led, RGBLED_NUM); + ws2812_setleds(led, RGBLIGHT_LED_COUNT); } } housekeeping_task_user(); @@ -80,7 +80,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) uint8_t tmp = start_led[4].g; start_led[4].g = start_led[4].r; start_led[4].r = tmp; - ws2812_setleds(start_led, RGBLED_NUM); + ws2812_setleds(start_led, RGBLIGHT_LED_COUNT); } const rgblight_driver_t rgblight_driver = { diff --git a/keyboards/newgame40/post_config.h b/keyboards/newgame40/post_config.h index 247178beec9e..7ac270c93210 100644 --- a/keyboards/newgame40/post_config.h +++ b/keyboards/newgame40/post_config.h @@ -1,14 +1,14 @@ #pragma once #ifndef IOS_DEVICE_ENABLE -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 255 # else # define RGBLIGHT_LIMIT_VAL 130 # endif # define RGBLIGHT_VAL_STEP 17 #else -# if RGBLED_NUM <= 6 +# if RGBLIGHT_LED_COUNT <= 6 # define RGBLIGHT_LIMIT_VAL 90 # else # define RGBLIGHT_LIMIT_VAL 45 diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c index b71f9119ef40..4e2f7dd4d6e2 100644 --- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c @@ -112,7 +112,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { rgblight_timer_disable(); uint8_t val = rgblight_get_val(); - rgblight_sethsv_range(255, 255, val, 0, RGBLED_NUM-1); + rgblight_sethsv_range(255, 255, val, 0, RGBLIGHT_LED_COUNT-1); } deafened = !deafened; } diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h index 2a1801a78f40..ab4d588cb0b7 100644 --- a/keyboards/redox/keymaps/default/config.h +++ b/keyboards/redox/keymaps/default/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +33,7 @@ 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_LED_COUNT 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/redox/keymaps/via/config.h b/keyboards/redox/keymaps/via/config.h index cfb2a9378a78..7b9be07d9779 100644 --- a/keyboards/redox/keymaps/via/config.h +++ b/keyboards/redox/keymaps/via/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +34,7 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 14 +#define RGBLIGHT_LED_COUNT 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h index e4d91482c9f6..cc14e26943f4 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h @@ -19,7 +19,7 @@ // place overrides here #define WS2812_DI_PIN D3 - #define RGBLED_NUM 9 + #define RGBLIGHT_LED_COUNT 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h index e4d91482c9f6..cc14e26943f4 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h @@ -19,7 +19,7 @@ // place overrides here #define WS2812_DI_PIN D3 - #define RGBLED_NUM 9 + #define RGBLIGHT_LED_COUNT 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h index d868c539e42c..d882e8ad949b 100644 --- a/keyboards/reviung/reviung39/keymaps/default/config.h +++ b/keyboards/reviung/reviung39/keymaps/default/config.h @@ -19,7 +19,7 @@ // place overrides here #define WS2812_DI_PIN D3 - #define RGBLED_NUM 11 + #define RGBLIGHT_LED_COUNT 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h index c44a5f9d7c30..3fd3c73fcc29 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/config.h +++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h @@ -19,7 +19,7 @@ // place overrides here #define WS2812_DI_PIN D3 - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/default_s/readme.md b/keyboards/reviung/reviung39/keymaps/default_s/readme.md index b882ec40c281..a67401b97c38 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/readme.md +++ b/keyboards/reviung/reviung39/keymaps/default_s/readme.md @@ -3,4 +3,4 @@ __REVIUNG39S is simple version__ The number of RGB LEDs is set to 6. -To change the number of RGB LEDs, change the "#define RGBLED_NUM 6" number in "default_s / config.h". +To change the number of RGB LEDs, change the "#define RGBLIGHT_LED_COUNT 6" number in "default_s / config.h". diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h index 854af5142d1f..ddd5ef6cf5fa 100644 --- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h @@ -20,7 +20,7 @@ // --- RGB underglow --- #define WS2812_DI_PIN B7 - #define RGBLED_NUM 12 + #define RGBLIGHT_LED_COUNT 12 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index a41959a88b7c..575e393b1da5 100644 --- a/keyboards/rgbkb/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h @@ -19,10 +19,10 @@ along with this program. If not, see . #pragma once #ifdef LED_MIRRORED - #define RGBLED_NUM 35 + #define RGBLIGHT_LED_COUNT 35 #else - #define RGBLED_NUM 70 + #define RGBLIGHT_LED_COUNT 70 #endif -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT #define RGB_MATRIX_CENTER { 112, 35 } diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index 19680c84b311..7016cf774431 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -24,28 +24,28 @@ along with this program. If not, see . #ifdef LED_MIRRORED #ifdef FULLHAND_ENABLE #define FULLHAND_LEDS 24 - #define RGBLED_NUM 74 + #define RGBLIGHT_LED_COUNT 74 #elif SF_ENABLE #define FULLHAND_LEDS 38 - #define RGBLED_NUM 81 + #define RGBLIGHT_LED_COUNT 81 #else #define FULLHAND_LEDS 0 - #define RGBLED_NUM 62 + #define RGBLIGHT_LED_COUNT 62 #endif #else #ifdef FULLHAND_ENABLE #define FULLHAND_LEDS 24 - #define RGBLED_NUM 148 + #define RGBLIGHT_LED_COUNT 148 #elif SF_ENABLE #define FULLHAND_LEDS 38 - #define RGBLED_NUM 162 + #define RGBLIGHT_LED_COUNT 162 #else #define FULLHAND_LEDS 0 - #define RGBLED_NUM 124 + #define RGBLIGHT_LED_COUNT 124 #endif #endif -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT #define RGB_MATRIX_CENTER { 112, 37 } diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h index 1de23afd63bc..e9d6659d603a 100644 --- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +35,7 @@ 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_LED_COUNT 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index 8a46a941b7c5..81f961540c1b 100644 --- a/keyboards/rgbkb/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h @@ -22,9 +22,9 @@ along with this program. If not, see . #define EE_HANDS #ifndef RGBLIGHT_SPLIT_ENABLE - #define RGBLED_NUM 30 + #define RGBLIGHT_LED_COUNT 30 #else - #define RGBLED_NUM 60 + #define RGBLIGHT_LED_COUNT 60 #endif #define RGB_MATRIX_LED_COUNT 60 diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h index 12d57843740e..f2a365a52e6f 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h @@ -25,11 +25,11 @@ #define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 -#ifdef RGBLED_NUM - #undef RGBLED_NUM +#ifdef RGBLIGHT_LED_COUNT + #undef RGBLIGHT_LED_COUNT #endif -#define RGBLED_NUM 55 // Number of LEDs +#define RGBLIGHT_LED_COUNT 55 // Number of LEDs #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 48, 7 } diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h index 392f2f97e8cc..d0f71f4f9f71 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h @@ -25,10 +25,10 @@ #define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 -#ifdef RGBLED_NUM - #undef RGBLED_NUM +#ifdef RGBLIGHT_LED_COUNT + #undef RGBLIGHT_LED_COUNT #endif -#define RGBLED_NUM 69 // Number of LEDs +#define RGBLIGHT_LED_COUNT 69 // Number of LEDs #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 48, 21 } diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h index 21494a0dfd24..36be4d68686e 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h @@ -21,8 +21,8 @@ #define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 -#ifdef RGBLED_NUM - #undef RGBLED_NUM +#ifdef RGBLIGHT_LED_COUNT + #undef RGBLIGHT_LED_COUNT #endif #define RGB_MATRIX_LED_COUNT 48 diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h index 73a3019540d0..ebc2b46717c9 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h @@ -25,6 +25,6 @@ #define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 -#define RGBLED_NUM 12 // Number of LEDs +#define RGBLIGHT_LED_COUNT 12 // Number of LEDs #define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 } diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index e8f1cca7ebb3..2c9eac876cdc 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -36,7 +36,7 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_BREATHE_CENTER 2 // 1 to 2.7 #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 /*== customize snake effect ==*/ - #define RGBLIGHT_EFFECT_SNAKE_LENGTH RGBLED_NUM + #define RGBLIGHT_EFFECT_SNAKE_LENGTH RGBLIGHT_LED_COUNT /*== customize knight effect ==*/ #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6 #endif diff --git a/keyboards/snes_macropad/snes_macropad.c b/keyboards/snes_macropad/snes_macropad.c index 1dcfda33ec1c..9f4f410fa3e2 100644 --- a/keyboards/snes_macropad/snes_macropad.c +++ b/keyboards/snes_macropad/snes_macropad.c @@ -90,7 +90,7 @@ static void setupForFlashing(void) { // Set alternating backlight colors const uint8_t max = 20; rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - for (size_t i = 0; i < RGBLED_NUM; ++i) { + for (size_t i = 0; i < RGBLIGHT_LED_COUNT; ++i) { rgb_led_t *led_ = (rgb_led_t *)&led[i]; switch (i % 2) { case 0: diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h index 7d14c6e3375c..ee137625c0ef 100644 --- a/keyboards/sofle/keymaps/rgb_default/config.h +++ b/keyboards/sofle/keymaps/rgb_default/config.h @@ -49,13 +49,13 @@ #ifdef RGB_MATRIX_ENABLE -#define RGBLED_NUM 35 // Number of LEDs -#define RGBLED_NUM 35 // Number of LEDs -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGBLIGHT_LED_COUNT 35 // Number of LEDs +#define RGBLIGHT_LED_COUNT 35 // Number of LEDs +#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT #endif #ifdef RGBLIGHT_ENABLE - #undef RGBLED_NUM + #undef RGBLIGHT_LED_COUNT //#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -68,11 +68,11 @@ //#define RGBLIGHT_EFFECT_ALTERNATING //#define RGBLIGHT_EFFECT_TWINKLE - #define RGBLED_NUM 70 + #define RGBLIGHT_LED_COUNT 70 //#define RGBLED_SPLIT #define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet - //#define RGBLED_NUM 30 + //#define RGBLIGHT_LED_COUNT 30 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h index e53881987da6..c70c410f771f 100644 --- a/keyboards/sofle/keymaps/via/config.h +++ b/keyboards/sofle/keymaps/via/config.h @@ -24,11 +24,11 @@ for more options. */ #if defined(KEYBOARD_sofle_rev1) // Add RGB underglow and top facing lighting # define WS2812_DI_PIN D3 -# define RGBLED_NUM 72 +# define RGBLIGHT_LED_COUNT 72 # define RGBLED_SPLIT \ { 36, 36 } # ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT RGBLED_NUM +# define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT # define RGB_MATRIX_SPLIT RGBLED_SPLIT # define SPLIT_TRANSPORT_MIRROR # else diff --git a/keyboards/stront/config.h b/keyboards/stront/config.h index 13c76a80e2d2..0694b9dd3cee 100644 --- a/keyboards/stront/config.h +++ b/keyboards/stront/config.h @@ -38,7 +38,7 @@ /* RGB config */ #ifdef RGB_MATRIX_ENABLE # define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_LED_COUNT RGBLED_NUM +# define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/tunks/ergo33/keymaps/default/config.h b/keyboards/tunks/ergo33/keymaps/default/config.h index 33edf0b03cce..3ca11c66a661 100644 --- a/keyboards/tunks/ergo33/keymaps/default/config.h +++ b/keyboards/tunks/ergo33/keymaps/default/config.h @@ -20,7 +20,7 @@ * No external LED PCB: 10 * External LED PCB: 14 */ -#define RGBLED_NUM 14 +#define RGBLIGHT_LED_COUNT 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/unison/keymaps/via/config.h b/keyboards/unison/keymaps/via/config.h index 48fe417a5dc5..07a2c9f5cc30 100644 --- a/keyboards/unison/keymaps/via/config.h +++ b/keyboards/unison/keymaps/via/config.h @@ -16,8 +16,8 @@ #pragma once - #undef RGBLED_NUM - #define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8) + #undef RGBLIGHT_LED_COUNT + #define RGBLIGHT_LED_COUNT 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8) #undef RGBLIGHT_LED_MAP #define RGBLIGHT_LED_MAP {2, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16} // Left to Right to Under diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h index 763b31aa109d..e82254fff17b 100644 --- a/keyboards/yosino58/keymaps/default/config.h +++ b/keyboards/yosino58/keymaps/default/config.h @@ -29,7 +29,7 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,7 +40,7 @@ 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_LED_COUNT 12 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 8a5240568cc3..8c057f687d57 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -116,7 +116,7 @@ animation_status_t animation_status = {}; #endif #ifndef LED_ARRAY -rgb_led_t led[RGBLED_NUM]; +rgb_led_t led[RGBLIGHT_LED_COUNT]; # define LED_ARRAY led #endif @@ -126,7 +126,7 @@ rgblight_segment_t const *const *rgblight_layers = NULL; static bool deferred_set_layer_state = false; #endif -rgblight_ranges_t rgblight_ranges = {0, RGBLED_NUM, 0, RGBLED_NUM, RGBLED_NUM}; +rgblight_ranges_t rgblight_ranges = {0, RGBLIGHT_LED_COUNT, 0, RGBLIGHT_LED_COUNT, RGBLIGHT_LED_COUNT}; void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) { rgblight_ranges.clipping_start_pos = start_pos; @@ -134,8 +134,8 @@ void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) { } void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) { - if (start_pos >= RGBLED_NUM) return; - if (start_pos + num_leds > RGBLED_NUM) return; + if (start_pos >= RGBLIGHT_LED_COUNT) return; + if (start_pos + num_leds > RGBLIGHT_LED_COUNT) return; rgblight_ranges.effect_start_pos = start_pos; rgblight_ranges.effect_end_pos = start_pos + num_leds; rgblight_ranges.effect_num_leds = num_leds; @@ -664,7 +664,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) { } void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) { - if (!rgblight_config.enable || index >= RGBLED_NUM) { + if (!rgblight_config.enable || index >= RGBLIGHT_LED_COUNT) { return; } @@ -700,7 +700,7 @@ static uint8_t get_interval_time(const uint8_t *default_interval_address, uint8_ #endif void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8_t end) { - if (!rgblight_config.enable || start < 0 || start >= end || end > RGBLED_NUM) { + if (!rgblight_config.enable || start < 0 || start >= end || end > RGBLIGHT_LED_COUNT) { return; } @@ -727,19 +727,19 @@ void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, #ifndef RGBLIGHT_SPLIT void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) { - rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2); + rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLIGHT_LED_COUNT / 2); } void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) { - rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); + rgblight_setrgb_range(r, g, b, (uint8_t)RGBLIGHT_LED_COUNT / 2, (uint8_t)RGBLIGHT_LED_COUNT); } void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) { - rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2); + rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLIGHT_LED_COUNT / 2); } void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) { - rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); + rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLIGHT_LED_COUNT / 2, (uint8_t)RGBLIGHT_LED_COUNT); } #endif // ifndef RGBLIGHT_SPLIT @@ -789,7 +789,7 @@ static void rgblight_layers_write(void) { break; // No more segments } // Write segment.count LEDs - rgb_led_t *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)]; + rgb_led_t *const limit = &led[MIN(segment.index + segment.count, RGBLIGHT_LED_COUNT)]; for (rgb_led_t *led_ptr = &led[segment.index]; led_ptr < limit; led_ptr++) { # ifdef RGBLIGHT_LAYERS_RETAIN_VAL sethsv(segment.hue, segment.sat, current_val, led_ptr); @@ -928,8 +928,8 @@ void rgblight_set(void) { #endif #ifdef RGBLIGHT_LED_MAP - rgb_led_t led0[RGBLED_NUM]; - for (uint8_t i = 0; i < RGBLED_NUM; i++) { + rgb_led_t led0[RGBLIGHT_LED_COUNT]; + for (uint8_t i = 0; i < RGBLIGHT_LED_COUNT; i++) { led0[i] = led[pgm_read_byte(&led_map[i])]; } start_led = led0 + rgblight_ranges.clipping_start_pos; @@ -1272,8 +1272,8 @@ void rgblight_effect_snake(animation_status_t *anim) { # endif for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) { k = pos + j * increment; - if (k > RGBLED_NUM) { - k = k % (RGBLED_NUM); + if (k > RGBLIGHT_LED_COUNT) { + k = k % (RGBLIGHT_LED_COUNT); } if (k < 0) { k = k + rgblight_ranges.effect_num_leds; @@ -1458,7 +1458,7 @@ typedef struct PACKED { uint8_t max_life; } TwinkleState; -static TwinkleState led_twinkle_state[RGBLED_NUM]; +static TwinkleState led_twinkle_state[RGBLIGHT_LED_COUNT]; void rgblight_effect_twinkle(animation_status_t *anim) { const bool random_color = anim->delta / 3; diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h index d2b8a24b1ebb..9e2b073776c3 100644 --- a/quantum/rgblight/rgblight.h +++ b/quantum/rgblight/rgblight.h @@ -16,6 +16,12 @@ #pragma once +// DEPRECATED DEFINES - DO NOT USE +#if defined(RGBLED_NUM) +# define RGBLIGHT_LED_COUNT RGBLED_NUM +#endif +// ======== + /***** rgblight_mode(mode)/rgblight_mode_noeeprom(mode) **** old mode number (before 0.6.117) to new mode name table @@ -234,7 +240,7 @@ void rgblight_unblink_all_but_layer(uint8_t layer); #endif -extern rgb_led_t led[RGBLED_NUM]; +extern rgb_led_t led[RGBLIGHT_LED_COUNT]; extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM;