Skip to content

Commit 2ee573f

Browse files
joukewitteveenjoukewitteveen
authored
led_update_kb -> led_update_ports where appropriate (#18716)
Following #14452, less boilerplate is needed to customize indicator led control.
1 parent ad8630b commit 2ee573f

File tree

13 files changed

+49
-101
lines changed

13 files changed

+49
-101
lines changed

‎keyboards/dk60/dk60.c

+5-9
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,10 @@ void led_init_ports(void) {
4444
setPinOutput(F0);
4545
}
4646

47-
bool led_update_kb(led_t led_state) {
48-
if (led_update_user(led_state)) {
49-
if (led_state.caps_lock) {
50-
dk60_caps_led_on();
51-
} else {
52-
dk60_caps_led_off();
53-
}
47+
void led_update_ports(led_t led_state) {
48+
if (led_state.caps_lock) {
49+
dk60_caps_led_on();
50+
} else {
51+
dk60_caps_led_off();
5452
}
55-
56-
return true;
5753
}

‎keyboards/dp60/keymaps/indicator/indicator.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,10 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
8080
indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
8181
}
8282

83-
bool led_update_kb(led_t led_state) {
84-
bool res = led_update_user(led_state);
85-
if (res) {
86-
rgblight_set_layer_state(0, led_state.caps_lock);
87-
rgblight_set_layer_state(1, led_state.scroll_lock);
88-
rgblight_set_layer_state(2, led_state.num_lock);
89-
}
90-
return res;
83+
void led_update_ports(led_t led_state) {
84+
rgblight_set_layer_state(0, led_state.caps_lock);
85+
rgblight_set_layer_state(1, led_state.scroll_lock);
86+
rgblight_set_layer_state(2, led_state.num_lock);
9187
}
9288

9389
layer_state_t layer_state_set_kb(layer_state_t state) {

‎keyboards/fallacy/fallacy.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@ void matrix_scan_kb(void) {
2929

3030
/* update LED driver with usb led_state
3131
*/
32-
bool led_update_kb(led_t led_state) {
33-
bool res = led_update_user(led_state);
34-
if(res) {
35-
set_fallacy_led(2, led_state.caps_lock); /* caps */
36-
set_fallacy_led(1, led_state.num_lock); /* num lock */
37-
set_fallacy_led(0, led_state.scroll_lock); /* scroll lock */
38-
}
39-
return res;
32+
void led_update_ports(led_t led_state) {
33+
set_fallacy_led(2, led_state.caps_lock); /* caps */
34+
set_fallacy_led(1, led_state.num_lock); /* num lock */
35+
set_fallacy_led(0, led_state.scroll_lock); /* scroll lock */
4036
}

‎keyboards/iron180/iron180.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#include "iron180.h"
1919

2020
#ifdef CAPSLOCK_BACKLIGHT
21-
bool led_update_kb(led_t led_state) {
22-
bool res = led_update_user(led_state);
21+
void led_update_ports(led_t led_state) {
2322
if (!led_state.caps_lock){
2423
if (is_backlight_breathing()) breathing_disable();
2524
backlight_disable();
@@ -28,6 +27,5 @@ bool led_update_kb(led_t led_state) {
2827
if (is_backlight_breathing()) breathing_enable();
2928
backlight_enable();
3029
}
31-
return res;
3230
}
3331
#endif

‎keyboards/kc60/kc60.c

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#include "kc60.h"
22

3-
bool led_update_kb(led_t led_state) {
4-
if (led_update_user(led_state)) {
5-
if (led_state.caps_lock) {
6-
setPinOutput(B2);
7-
} else {
8-
setPinInput(B2);
9-
}
3+
void led_update_ports(led_t led_state) {
4+
if (led_state.caps_lock) {
5+
setPinOutput(B2);
6+
} else {
7+
setPinInput(B2);
108
}
11-
12-
return true;
139
}

‎keyboards/metamechs/timberwolf/timberwolf.c

+5-9
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@
1616

1717
#include "timberwolf.h"
1818

19-
bool led_update_kb(led_t led_state) {
20-
bool runDefault = led_update_user(led_state);
21-
if(runDefault) {
22-
if (led_state.caps_lock) {
23-
backlight_level_noeeprom(get_backlight_level());
24-
} else {
25-
backlight_set(0);
26-
}
19+
void led_update_ports(led_t led_state) {
20+
if (led_state.caps_lock) {
21+
backlight_level_noeeprom(get_backlight_level());
22+
} else {
23+
backlight_set(0);
2724
}
28-
return runDefault;
2925
}
3026

3127
bool encoder_update_kb(uint8_t index, bool clockwise) {

‎keyboards/moonlander/moonlander.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,8 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
370370
#endif
371371

372372
#ifdef CAPS_LOCK_STATUS
373-
bool led_update_kb(led_t led_state) {
374-
bool res = led_update_user(led_state);
375-
if(res) {
376-
ML_LED_6(led_state.caps_lock);
377-
}
378-
return res;
373+
void led_update_ports(led_t led_state) {
374+
ML_LED_6(led_state.caps_lock);
379375
}
380376
#endif
381377

‎keyboards/novelkeys/nk65/nk65.c

+5-9
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,12 @@
2525
* Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
2626
* Bottom LED is red only LED driver 2 RGB 6 Green channel.
2727
*/
28-
bool led_update_kb(led_t led_state) {
29-
bool res = led_update_user(led_state);
30-
if(res) {
31-
if (led_state.caps_lock) {
32-
IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
33-
} else {
34-
IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
35-
}
28+
void led_update_ports(led_t led_state) {
29+
if (led_state.caps_lock) {
30+
IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
31+
} else {
32+
IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
3633
}
37-
return res;
3834
}
3935

4036
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {

‎keyboards/nullbitsco/nibble/nibble.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
#include QMK_KEYBOARD_H
1717

1818
// Use Bit-C LED to show CAPS LOCK status
19-
bool led_update_kb(led_t led_state) {
20-
bool res = led_update_user(led_state);
21-
if (res) {
22-
set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
23-
}
24-
return res;
19+
void led_update_ports(led_t led_state) {
20+
set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
2521
}

‎keyboards/nullbitsco/tidbit/tidbit.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
103103
}
104104

105105
// Use Bit-C LED to show NUM LOCK status
106-
bool led_update_kb(led_t led_state) {
107-
bool res = led_update_user(led_state);
108-
if (res) {
109-
set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
110-
}
111-
return res;
106+
void led_update_ports(led_t led_state) {
107+
set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
112108
}
113109

114110
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {

‎keyboards/viendi8l/viendi8l.c

+3-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ uint8_t caps_color[3] = {0xFF,0xFF,0xFF};
2323
uint8_t num_color[3] = {0xFF,0xFF,0xFF};
2424
uint8_t layer_color[3] = {0xFF,0xFF,0xFF};
2525

26-
bool led_update_kb(led_t led_state) {
27-
bool res = led_update_user(led_state);
28-
if(res) {
29-
led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
30-
led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
31-
}
32-
return res;
26+
void led_update_ports(led_t led_state) {
27+
led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
28+
led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
3329
}
3430

3531
layer_state_t layer_state_set_kb(layer_state_t state) {

‎keyboards/weirdo/ls_60/ls_60.c

+5-11
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,10 @@
1616
#include "ls_60.h"
1717

1818

19-
bool led_update_kb(led_t led_state) {
20-
bool res = led_update_user(led_state);
21-
22-
if (res) {
23-
if(led_state.caps_lock){
24-
rgblight_setrgb_at(192, 192, 192, 0);
25-
} else {
26-
rgblight_setrgb_at(0, 0, 0, 0);
27-
}
19+
void led_update_ports(led_t led_state) {
20+
if(led_state.caps_lock){
21+
rgblight_setrgb_at(192, 192, 192, 0);
22+
} else {
23+
rgblight_setrgb_at(0, 0, 0, 0);
2824
}
29-
30-
return res;
3125
}

‎keyboards/yiancardesigns/seigaiha/seigaiha.c

+6-10
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@
2020

2121
uint8_t send_data = 0x00;
2222

23-
bool led_update_kb(led_t led_state) {
24-
bool res = led_update_user(led_state);
25-
if(res) {
26-
if (led_state.caps_lock){
27-
send_data |= 1 << 5;
28-
} else {
29-
send_data &= ~(1 << 5);
30-
}
31-
i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
23+
void led_update_ports(led_t led_state) {
24+
if (led_state.caps_lock){
25+
send_data |= 1 << 5;
26+
} else {
27+
send_data &= ~(1 << 5);
3228
}
33-
return res;
29+
i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
3430
}
3531

3632
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {

0 commit comments

Comments
 (0)