Change DRIVER_LED_COUNT
to {LED,RGB}_MATRIX_LED_COUNT
(#18399)
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
|
||||
// If RGBLight is enabled
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
# define RGBLED_NUM DRIVER_LED_TOTAL
|
||||
# define RGBLED_NUM RGB_MATRIX_LED_COUNT
|
||||
|
||||
# define RGBLIGHT_EFFECT_SNAKE
|
||||
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
|
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
#define LAYER (get_highest_layer(layer_state))
|
||||
#define LAYER_SIZE (MATRIX_ROWS * MATRIX_COLS)
|
||||
#define CHECK_LED() \
|
||||
if ((i >= DRIVER_LED_TOTAL) \
|
||||
if ((i >= RGB_MATRIX_LED_COUNT) \
|
||||
|| ((g_led_config.flags[pos] == LED_FLAG_NONE) || (g_led_config.flags[pos] == LED_FLAG_UNDERGLOW))) \
|
||||
continue
|
||||
|
||||
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
#ifdef UNDERGLOW_DISABLE
|
||||
void keyboard_pre_init_user(void) {
|
||||
|
||||
for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
|
||||
for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
|
||||
if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
|
||||
g_led_config.flags[key_id] = LED_FLAG_NONE;
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
|
||||
rgb_matrix_set_color(i, 0, 0, 0);
|
||||
}
|
||||
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//capslock
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 255, 255, 255);
|
||||
}
|
||||
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//nav layer
|
||||
if (IS_LAYER_ON(NAVR)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 0, 204, 255);
|
||||
}
|
||||
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//funl layer
|
||||
if (IS_LAYER_ON(FUNL)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 255, 0, 0);
|
||||
}
|
||||
@@ -107,7 +107,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//nsl layer
|
||||
if (IS_LAYER_ON(NSL)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 51, 0, 255);
|
||||
}
|
||||
@@ -116,7 +116,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//nssl layer
|
||||
if (IS_LAYER_ON(NSSL)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 0, 255, 0);
|
||||
}
|
||||
@@ -125,7 +125,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//game layer
|
||||
if (IS_LAYER_ON(GAME)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 0, 204, 255);
|
||||
}
|
||||
@@ -134,7 +134,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//secgame layer
|
||||
if (IS_LAYER_ON(SECGAME)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 255, 0, 0);
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
|
||||
rgb_matrix_set_color(i, 0, 0, 0);
|
||||
}
|
||||
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//capslock
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 255, 255, 255);
|
||||
}
|
||||
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//game layer
|
||||
if (IS_LAYER_ON(GAME)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 0, 204, 255);
|
||||
}
|
||||
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
|
||||
//secgame layer
|
||||
if (IS_LAYER_ON(SECGAME)) {
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
|
||||
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
|
||||
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
|
||||
rgb_matrix_set_color(i, 255, 0, 0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user