Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Per Key LED Indicator Callbacks #18450

Merged
merged 15 commits into from
Oct 4, 2022
Merged

Fix Per Key LED Indicator Callbacks #18450

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e26d7d0
Change indicator callbacks to boolean functions
drashna Sep 21, 2022
7afb401
Fix default/via keymaps for rgb matrix
drashna Sep 21, 2022
63c1767
Change led indicators to be bool
drashna Sep 21, 2022
9325597
Fix lint
drashna Sep 21, 2022
877415c
Update user code
drashna Sep 22, 2022
c387dbb
I should update the docs, shuoldn't I?
drashna Sep 22, 2022
8ec87c4
Apply suggestions from code review
drashna Sep 22, 2022
837c863
Update keyboards/keybee/keybee65/keymaps/via/keymap.c
drashna Sep 22, 2022
7d6b413
Update keyboards/tkc/portico/portico.c
drashna Sep 22, 2022
73197e0
Update keyboards/planck/keymaps/gunp/keymap.c
drashna Sep 22, 2022
62289b8
Merge branch 'develop' into core/fix_per_key_callbacks
drashna Sep 23, 2022
4add657
Merge branch 'develop' into core/fix_per_key_callbacks
drashna Sep 24, 2022
2ce5f86
Add additional boards
drashna Sep 24, 2022
0e1efc2
Merge remote-tracking branch 'origin/develop' into core/fix_per_key_c…
drashna Sep 26, 2022
eb180f1
Merge branch 'develop' into core/fix_per_key_callbacks
drashna Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion keyboards/4pplet/perk60_iso/rev_a/rev_a.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,19 @@ led_config_t g_led_config = {
}
};

__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
}

if (host_keyboard_led_state().caps_lock && CAPS_LOCK_ENABLE) {
for (uint8_t i = led_min; i <= led_max; i++) {
if (g_led_config.flags[i] & CAPS_LED_GROUP) {
rgb_matrix_set_color(i, CAPS_LOCK_COLOR);
}
}
}

return true;
}
#endif
7 changes: 5 additions & 2 deletions keyboards/abatskeyboardclub/nayeon/nayeon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ led_config_t g_led_config = {{
LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
}};

void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
}
if (!host_keyboard_led_state().caps_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
}
if (!host_keyboard_led_state().scroll_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
}

rgb_matrix_indicators_advanced_user(led_min, led_max);
return true;
}
5 changes: 3 additions & 2 deletions keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void keyboard_post_init_user(void) {
};

// Custom RGB indicator behaviour:
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 led_processed_count = 0;
for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
Expand Down Expand Up @@ -115,10 +115,11 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
break;
default:
break;
}
}
}
}
}
}
}
return false;
}
65 changes: 34 additions & 31 deletions keyboards/axolstudio/yeti/hotswap/hotswap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },
{ 0, B_4, A_4, C_4 },
{ 0, B_5, A_5, C_5 },
{ 0, B_6, A_6, C_6 },
{ 0, B_7, A_7, C_7 },
{ 0, B_8, A_8, C_8 },
{ 0, B_9, A_9, C_9 },
{ 0, B_10, A_10, C_10 },
{ 0, B_11, A_11, C_11 },
{ 0, B_12, A_12, C_12 },
{ 0, B_13, A_13, C_13 },
{ 0, B_4, A_4, C_4 },
{ 0, B_5, A_5, C_5 },
{ 0, B_6, A_6, C_6 },
{ 0, B_7, A_7, C_7 },
{ 0, B_8, A_8, C_8 },
{ 0, B_9, A_9, C_9 },
{ 0, B_10, A_10, C_10 },
{ 0, B_11, A_11, C_11 },
{ 0, B_12, A_12, C_12 },
{ 0, B_13, A_13, C_13 },
{ 0, B_14, A_14, C_14 },
{ 0, B_15, A_15, C_15 },
{ 0, E_1, D_1, F_1 },

{ 0, E_1, D_1, F_1 },
{ 0, E_2, D_2, F_2 },
{ 0, E_3, D_3, F_3 },
{ 0, E_4, D_4, F_4 },
Expand All @@ -46,13 +46,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, E_10, D_10, F_10 },
{ 0, E_11, D_11, F_11 },
{ 0, E_12, D_12, F_12 },
{ 0, E_13, D_13, F_13 },
{ 0, E_14, D_14, F_14 },
{ 0, E_13, D_13, F_13 },
{ 0, E_14, D_14, F_14 },
{ 0, E_15, D_15, F_15 },
{ 0, H_1, G_1, I_1 },
{ 0, H_2, G_2, I_2 },
{ 0, H_3, G_3, I_3 },

{ 0, H_1, G_1, I_1 },
{ 0, H_2, G_2, I_2 },
{ 0, H_3, G_3, I_3 },
{ 0, H_4, G_4, I_4 },
{ 0, H_5, G_5, I_5 },
{ 0, H_6, G_6, I_6 },
Expand All @@ -67,25 +67,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {

{ 0, K_2, J_2, L_2 },
{ 0, K_3, J_3, L_3 },
{ 0, K_4, J_4, L_4 },
{ 0, K_4, J_4, L_4 },
{ 0, K_5, J_5, L_5 },
{ 0, K_6, J_6, L_6 },
{ 0, K_7, J_7, L_7 },
{ 0, K_8, J_8, L_8 },
{ 0, K_9, J_9, L_9 },
{ 0, K_7, J_7, L_7 },
{ 0, K_8, J_8, L_8 },
{ 0, K_9, J_9, L_9 },
{ 0, K_10, J_10, L_10 },
{ 0, K_11, J_11, L_11 },
{ 0, K_12, J_12, L_12 },
{ 0, K_13, J_13, L_13 },
{ 0, K_11, J_11, L_11 },
{ 0, K_12, J_12, L_12 },
{ 0, K_13, J_13, L_13 },
{ 0, K_14, J_14, L_14 },

{ 0, K_1, J_1, L_1 },
{ 0, K_16, J_16, L_16 },
{ 0, H_16, G_16, I_16 },
{ 0, E_16, D_16, F_16 },
{ 0, B_16, A_16, C_16 },
{ 0, E_16, D_16, F_16 },
{ 0, B_16, A_16, C_16 },
{ 0, H_15, G_15, I_15 },
{ 0, K_15, J_15, L_15 },
{ 0, K_15, J_15, L_15 },
};

led_config_t g_led_config = {
Expand All @@ -102,17 +102,20 @@ led_config_t g_led_config = {
{16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
{16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
}, {
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 1, 4, 1, 1
}
};
#endif
__attribute__ ((weak))
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
}
return true;
}
3 changes: 2 additions & 1 deletion keyboards/bandominedoni/keymaps/led/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}

#ifdef RGB_MATRIX_ENABLE
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
uint8_t layer = get_highest_layer(layer_state);
switch (layer) {
Expand Down Expand Up @@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
break;
}
}
return false;
}
#endif
3 changes: 2 additions & 1 deletion keyboards/bandominedoni/keymaps/lednotg/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}

#ifdef RGB_MATRIX_ENABLE
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
uint8_t layer = biton32(layer_state);
switch (layer) {
Expand Down Expand Up @@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
break;
}
}
return false;
}
#endif
3 changes: 2 additions & 1 deletion keyboards/bandominedoni/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}

#ifdef RGB_MATRIX_ENABLE
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
uint8_t layer = get_highest_layer(layer_state);
switch (layer) {
Expand Down Expand Up @@ -177,5 +177,6 @@ void rgb_matrix_indicators_user(void) {
break;
}
}
return false;
}
#endif
27 changes: 14 additions & 13 deletions keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_QWERTY] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
),
[_DEFAULT] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN1_60] = LAYOUT_all(
Expand All @@ -43,31 +43,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_DEFAULT)
)

};


void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
uint8_t layer = get_highest_layer(layer_state);
switch (layer) {
case _FN1_60:
rgb_matrix_set_color(10, 0, 0, 255);
rgb_matrix_set_color(10, 0, 0, 255);
break;
case _FN2_60:
rgb_matrix_set_color(10, 255, 255, 255);
rgb_matrix_set_color(10, 255, 255, 255);
break;
case _DEFAULT:
rgb_matrix_set_color(10, 0, 255, 0);
rgb_matrix_set_color(10, 0, 255, 0);
break;
default:
break;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(10, 255, 0, 0);
}
return false;
}

void matrix_init_kb(void){
Expand Down
7 changes: 5 additions & 2 deletions keyboards/canary/canary60rgb/canary60rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,13 @@ led_config_t g_led_config = {
}
};

__attribute__ ((weak))
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
drashna marked this conversation as resolved.
Show resolved Hide resolved
if (!rgb_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
}
return true;
}
#endif
6 changes: 5 additions & 1 deletion keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ void matrix_init_kb(void) {
}

/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
void rgb_matrix_indicators_kb(void) {
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(62, 255, 255, 255);
}
if (host_keyboard_led_state().scroll_lock) {
rgb_matrix_set_color(14, 255, 255, 255);
}
return true;
}

/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
Expand Down
6 changes: 5 additions & 1 deletion keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ void matrix_init_kb(void) {
}

/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
void rgb_matrix_indicators_kb(void) {
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(62, 255, 255, 255);
}
if (host_keyboard_led_state().scroll_lock) {
rgb_matrix_set_color(14, 255, 255, 255);
}
return true;
}

/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
Expand Down
7 changes: 5 additions & 2 deletions keyboards/cherrybstudio/cb87rgb/cb87rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ led_config_t g_led_config = { {

} };

__attribute__ ((weak))
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(51, 255, 255, 255);
}
if (host_keyboard_led_state().scroll_lock) {
rgb_matrix_set_color(14, 255, 255, 255);
}
return true;
}
#endif
3 changes: 2 additions & 1 deletion keyboards/chromatonemini/keymaps/led/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
}
}

void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
// uint32_t mode = rgblight_get_mode();

if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
Expand Down Expand Up @@ -678,5 +678,6 @@ void rgb_matrix_indicators_user(void) {
break;
}
}
return false;
}
#endif // RGB_MATRIX_ENABLE
3 changes: 2 additions & 1 deletion keyboards/chromatonemini/keymaps/party/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
}
}

void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
// uint32_t mode = rgblight_get_mode();

if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
Expand Down Expand Up @@ -680,5 +680,6 @@ void rgb_matrix_indicators_user(void) {
break;
}
}
return false;
}
#endif // RGB_MATRIX_ENABLE
Loading