mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-07-06 03:40:35 -04:00
Rename RGBLED_NUM
-> RGBLIGHT_LED_COUNT
(#22570)
This commit is contained in:
parent
1ae3697165
commit
d85f11ad16
11 changed files with 28 additions and 28 deletions
|
@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// #define MASTER_RIGHT
|
// #define MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
// #undef RGBLED_NUM
|
// #undef RGBLIGHT_LED_COUNT
|
||||||
// #define RGBLED_NUM 14
|
// #define RGBLIGHT_LED_COUNT 14
|
||||||
// #define RGBLIGHT_HUE_STEP 8
|
// #define RGBLIGHT_HUE_STEP 8
|
||||||
// #define RGBLIGHT_SAT_STEP 8
|
// #define RGBLIGHT_SAT_STEP 8
|
||||||
// #define RGBLIGHT_VAL_STEP 8
|
// #define RGBLIGHT_VAL_STEP 8
|
||||||
|
|
|
@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// #define MASTER_RIGHT
|
// #define MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
#undef RGBLED_NUM
|
#undef RGBLIGHT_LED_COUNT
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
@ -42,6 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_EFFECT_RGB_TEST
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 10
|
#define RGBLIGHT_LED_COUNT 10
|
||||||
|
|
||||||
#define NO_MUSIC_MODE
|
#define NO_MUSIC_MODE
|
||||||
|
|
|
@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
// Underglow
|
// Underglow
|
||||||
/*
|
/*
|
||||||
#undef RGBLED_NUM
|
#undef RGBLIGHT_LED_COUNT
|
||||||
#define RGBLED_NUM 14 // Number of LEDs
|
#define RGBLIGHT_LED_COUNT 14 // Number of LEDs
|
||||||
#define RGBLIGHT_SLEEP
|
#define RGBLIGHT_SLEEP
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
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(
|
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(
|
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[] =
|
const rgblight_segment_t* const PROGMEM _rgb_layers[] =
|
||||||
|
|
|
@ -26,10 +26,10 @@ enum layer_names {
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#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_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
|
||||||
const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
|
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, RGBLED_NUM, HSV_RED});
|
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, RGBLED_NUM, HSV_GREEN});
|
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);
|
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
|
#endif
|
||||||
|
|
|
@ -26,10 +26,10 @@ enum layer_names {
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#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_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
|
||||||
const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
|
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, RGBLED_NUM, HSV_RED});
|
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, RGBLED_NUM, HSV_GREEN});
|
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);
|
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
|
#endif
|
||||||
|
|
|
@ -29,10 +29,10 @@ enum layer_names {
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#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_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
|
||||||
const rgblight_segment_t PROGMEM my_lwr_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
|
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, RGBLED_NUM, HSV_RED});
|
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, RGBLED_NUM, HSV_GREEN});
|
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);
|
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
|
#endif
|
||||||
|
|
|
@ -112,7 +112,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
} else {
|
} else {
|
||||||
rgblight_timer_disable();
|
rgblight_timer_disable();
|
||||||
uint8_t val = rgblight_get_val();
|
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;
|
deafened = !deafened;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// #define MASTER_RIGHT
|
// #define MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
#undef RGBLED_NUM
|
#undef RGBLIGHT_LED_COUNT
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
#define RGBLED_NUM 14
|
#define RGBLIGHT_LED_COUNT 14
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
|
|
|
@ -24,11 +24,11 @@ for more options. */
|
||||||
#if defined(KEYBOARD_sofle_rev1)
|
#if defined(KEYBOARD_sofle_rev1)
|
||||||
// Add RGB underglow and top facing lighting
|
// Add RGB underglow and top facing lighting
|
||||||
# define WS2812_DI_PIN D3
|
# define WS2812_DI_PIN D3
|
||||||
# define RGBLED_NUM 72
|
# define RGBLIGHT_LED_COUNT 72
|
||||||
# define RGBLED_SPLIT \
|
# define RGBLED_SPLIT \
|
||||||
{ 36, 36 }
|
{ 36, 36 }
|
||||||
# ifdef RGB_MATRIX_ENABLE
|
# 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 RGB_MATRIX_SPLIT RGBLED_SPLIT
|
||||||
# define SPLIT_TRANSPORT_MIRROR
|
# define SPLIT_TRANSPORT_MIRROR
|
||||||
# else
|
# else
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#undef RGBLED_NUM
|
#undef RGBLIGHT_LED_COUNT
|
||||||
#define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
|
#define RGBLIGHT_LED_COUNT 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
|
||||||
|
|
||||||
#undef RGBLIGHT_LED_MAP
|
#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
|
#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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue