From c6668b9cd9d153ed8cdd59f2f96d9deba1001e1a Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 22 Feb 2024 21:10:16 +1100 Subject: [PATCH] Migrate `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` in remaining non-user keymaps (#23128) --- keyboards/40percentclub/ut47/keymaps/rgb/config.h | 2 +- keyboards/evyd13/gh80_3700/keymaps/rgb/config.h | 2 +- keyboards/evyd13/plain60/keymaps/rgb/config.h | 2 +- keyboards/giabalanai/keymaps/giabarinaix2led/config.h | 4 ++-- keyboards/handwired/minorca/keymaps/rgb/config.h | 2 +- keyboards/handwired/onekey/keymaps/rgb/config.h | 2 +- keyboards/keebio/iris/keymaps/dvorak/config.h | 4 ++-- keyboards/labbe/labbeminiv1/keymaps/rgb/config.h | 2 +- keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h | 4 ++-- .../recompile_keys/nomu30/keymaps/center_sprit/config.h | 2 +- keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h | 2 +- keyboards/tada68/keymaps/rgb/config.h | 2 +- keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h | 2 +- keyboards/tunks/ergo33/keymaps/rgb/config.h | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h index 8dc267380a..d48ee2bf3f 100644 --- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h +++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h @@ -29,4 +29,4 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define WS2812_DI_PIN D3 // The pin the LED strip is connected to -#define RGBLED_NUM 7 // Number of LEDs in your strip +#define RGBLIGHT_LED_COUNT 7 // Number of LEDs in your strip diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h index c0a6bf5976..f0ae6b07ee 100644 --- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h +++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h @@ -17,7 +17,7 @@ #pragma once #define WS2812_DI_PIN B2 -#define RGBLED_NUM 8 +#define RGBLIGHT_LED_COUNT 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h index e34715a773..43c4f02197 100644 --- a/keyboards/evyd13/plain60/keymaps/rgb/config.h +++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h @@ -11,7 +11,7 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 20 // limit to 20 otherwise brownouts +#define RGBLIGHT_LED_COUNT 20 // limit to 20 otherwise brownouts #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h index dd10d213a0..01ad55eec0 100644 --- a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h +++ b/keyboards/giabalanai/keymaps/giabarinaix2led/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/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h index 4bee6b205d..16e748dd70 100644 --- a/keyboards/handwired/minorca/keymaps/rgb/config.h +++ b/keyboards/handwired/minorca/keymaps/rgb/config.h @@ -12,7 +12,7 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 13 // Number of LEDs +#define RGBLIGHT_LED_COUNT 13 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/handwired/onekey/keymaps/rgb/config.h b/keyboards/handwired/onekey/keymaps/rgb/config.h index 1e54383769..1434c4d0c8 100644 --- a/keyboards/handwired/onekey/keymaps/rgb/config.h +++ b/keyboards/handwired/onekey/keymaps/rgb/config.h @@ -1,6 +1,6 @@ #pragma once -#define RGBLED_NUM 9 +#define RGBLIGHT_LED_COUNT 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h index 1fe0765647..0776d7e179 100644 --- a/keyboards/keebio/iris/keymaps/dvorak/config.h +++ b/keyboards/keebio/iris/keymaps/dvorak/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . #define MASTER_LEFT -#undef RGBLED_NUM +#undef RGBLIGHT_LED_COUNT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +32,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/labbe/labbeminiv1/keymaps/rgb/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h index 0a7038363d..087f4d7675 100644 --- a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h +++ b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h @@ -18,7 +18,7 @@ // ws2812 options #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to -#define RGBLED_NUM 4 // number of LEDs +#define RGBLIGHT_LED_COUNT 4 // number of LEDs #define RGBLIGHT_DEFAULT_MODE 6 // set the rainbow mode #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h index a06078bce1..3aa0db7e38 100644 --- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h +++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h @@ -17,8 +17,8 @@ // ws2812 options #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to -#define RGBLED_NUM 4 // number of LEDs -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGBLIGHT_LED_COUNT 4 // number of LEDs +#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h index e7ca3c1760..42b68131be 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h @@ -61,5 +61,5 @@ along with this program. If not, see . #define WS2812_DI_PIN B5 #define RGBLIGHT_TIMER - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h index e7ca3c1760..42b68131be 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h @@ -61,5 +61,5 @@ along with this program. If not, see . #define WS2812_DI_PIN B5 #define RGBLIGHT_TIMER - #define RGBLED_NUM 6 + #define RGBLIGHT_LED_COUNT 6 #endif diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h index f902184d82..21ddfa1850 100755 --- a/keyboards/tada68/keymaps/rgb/config.h +++ b/keyboards/tada68/keymaps/rgb/config.h @@ -12,7 +12,7 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 16 // Number of LEDs. Change this to match your use case. +#define RGBLIGHT_LED_COUNT 16 // Number of LEDs. Change this to match your use case. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h index 49d7d463aa..07915657c1 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h @@ -38,5 +38,5 @@ #ifdef RGBLIGHT_ENABLE #define WS2812_DI_PIN D0 #define RGBLIGHT_TIMER - #define RGBLED_NUM 3 + #define RGBLIGHT_LED_COUNT 3 #endif diff --git a/keyboards/tunks/ergo33/keymaps/rgb/config.h b/keyboards/tunks/ergo33/keymaps/rgb/config.h index 60cee638d2..036bcf81b8 100644 --- a/keyboards/tunks/ergo33/keymaps/rgb/config.h +++ b/keyboards/tunks/ergo33/keymaps/rgb/config.h @@ -20,9 +20,9 @@ * No external LED PCB: 10 * External LED PCB: 14 */ -#if defined(RGBLED_NUM) -# undef RGBLED_NUM -# define RGBLED_NUM 10 +#if defined(RGBLIGHT_LED_COUNT) +# undef RGBLIGHT_LED_COUNT +# define RGBLIGHT_LED_COUNT 10 #endif #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD