Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t current_layer = get_highest_layer(layer_state);
|
||||
switch (current_layer) {
|
||||
case MAC_BASE:
|
||||
@@ -49,6 +49,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
|
||||
|
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t current_layer = get_highest_layer(layer_state);
|
||||
switch (current_layer) {
|
||||
case MAC_BASE:
|
||||
@@ -54,6 +54,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
|
||||
@@ -67,11 +68,11 @@ void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t l
|
||||
|
||||
bool is_caps_lock_indicator(uint16_t keycode) {
|
||||
bool indicator = keycode == KC_CAPS;
|
||||
|
||||
|
||||
if (get_caps_lock_light_tab()) {
|
||||
indicator = keycode == KC_TAB || keycode == KC_CAPS;
|
||||
}
|
||||
|
||||
|
||||
if (get_caps_lock_light_alphas()) {
|
||||
return (KC_A <= keycode && keycode <= KC_Z) || indicator;
|
||||
} else {
|
||||
@@ -80,4 +81,4 @@ bool is_caps_lock_indicator(uint16_t keycode) {
|
||||
}
|
||||
|
||||
bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
|
||||
bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
|
||||
bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
|
||||
|
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t current_layer = get_highest_layer(layer_state | default_layer_state);
|
||||
switch (current_layer) {
|
||||
case MAC_BASE:
|
||||
@@ -59,6 +59,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
|
||||
|
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t current_layer = get_highest_layer(layer_state);
|
||||
switch (current_layer) {
|
||||
case MAC_BASE:
|
||||
@@ -49,6 +49,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
|
||||
|
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t current_layer = get_highest_layer(layer_state);
|
||||
switch (current_layer) {
|
||||
case MAC_BASE:
|
||||
@@ -54,6 +54,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
|
||||
@@ -67,11 +68,11 @@ void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t l
|
||||
|
||||
bool is_caps_lock_indicator(uint16_t keycode) {
|
||||
bool indicator = keycode == KC_CAPS;
|
||||
|
||||
|
||||
if (get_caps_lock_light_tab()) {
|
||||
indicator = keycode == KC_TAB || keycode == KC_CAPS;
|
||||
}
|
||||
|
||||
|
||||
if (get_caps_lock_light_alphas()) {
|
||||
return (KC_A <= keycode && keycode <= KC_Z) || indicator;
|
||||
} else {
|
||||
@@ -80,4 +81,4 @@ bool is_caps_lock_indicator(uint16_t keycode) {
|
||||
}
|
||||
|
||||
bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
|
||||
bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
|
||||
bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
|
||||
|
Reference in New Issue
Block a user