summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2022-10-15 21:09:03 +0200
committerGitHub <noreply@github.com>2022-10-15 15:09:03 -0400
commit2ee573fc5f9076d1773bd17c851cd581cc67582f (patch)
tree6cf109bd5fd93eba39bf72a77a7e362f4980726c /keyboards
parentad8630bd7229937877aa9a29693bbb8942a27abe (diff)
led_update_kb -> led_update_ports where appropriate (#18716)
Following #14452, less boilerplate is needed to customize indicator led control.
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/dk60/dk60.c14
-rw-r--r--keyboards/dp60/keymaps/indicator/indicator.c12
-rwxr-xr-xkeyboards/fallacy/fallacy.c12
-rw-r--r--keyboards/iron180/iron180.c4
-rw-r--r--keyboards/kc60/kc60.c14
-rw-r--r--keyboards/metamechs/timberwolf/timberwolf.c14
-rw-r--r--keyboards/moonlander/moonlander.c8
-rwxr-xr-xkeyboards/novelkeys/nk65/nk65.c14
-rw-r--r--keyboards/nullbitsco/nibble/nibble.c8
-rw-r--r--keyboards/nullbitsco/tidbit/tidbit.c8
-rw-r--r--keyboards/viendi8l/viendi8l.c10
-rw-r--r--keyboards/weirdo/ls_60/ls_60.c16
-rw-r--r--keyboards/yiancardesigns/seigaiha/seigaiha.c16
13 files changed, 49 insertions, 101 deletions
diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c
index 7d9f793866..382404c032 100644
--- a/keyboards/dk60/dk60.c
+++ b/keyboards/dk60/dk60.c
@@ -44,14 +44,10 @@ void led_init_ports(void) {
setPinOutput(F0);
}
-bool led_update_kb(led_t led_state) {
- if (led_update_user(led_state)) {
- if (led_state.caps_lock) {
- dk60_caps_led_on();
- } else {
- dk60_caps_led_off();
- }
+void led_update_ports(led_t led_state) {
+ if (led_state.caps_lock) {
+ dk60_caps_led_on();
+ } else {
+ dk60_caps_led_off();
}
-
- return true;
}
diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c
index a3a826e8a0..999e0c3338 100644
--- a/keyboards/dp60/keymaps/indicator/indicator.c
+++ b/keyboards/dp60/keymaps/indicator/indicator.c
@@ -80,14 +80,10 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
}
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if (res) {
- rgblight_set_layer_state(0, led_state.caps_lock);
- rgblight_set_layer_state(1, led_state.scroll_lock);
- rgblight_set_layer_state(2, led_state.num_lock);
- }
- return res;
+void led_update_ports(led_t led_state) {
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ rgblight_set_layer_state(1, led_state.scroll_lock);
+ rgblight_set_layer_state(2, led_state.num_lock);
}
layer_state_t layer_state_set_kb(layer_state_t state) {
diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
index 103860f0f8..486084098a 100755
--- a/keyboards/fallacy/fallacy.c
+++ b/keyboards/fallacy/fallacy.c
@@ -29,12 +29,8 @@ void matrix_scan_kb(void) {
/* update LED driver with usb led_state
*/
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- set_fallacy_led(2, led_state.caps_lock); /* caps */
- set_fallacy_led(1, led_state.num_lock); /* num lock */
- set_fallacy_led(0, led_state.scroll_lock); /* scroll lock */
- }
- return res;
+void led_update_ports(led_t led_state) {
+ set_fallacy_led(2, led_state.caps_lock); /* caps */
+ set_fallacy_led(1, led_state.num_lock); /* num lock */
+ set_fallacy_led(0, led_state.scroll_lock); /* scroll lock */
}
diff --git a/keyboards/iron180/iron180.c b/keyboards/iron180/iron180.c
index 546ff7fc8f..402ee23e1f 100644
--- a/keyboards/iron180/iron180.c
+++ b/keyboards/iron180/iron180.c
@@ -18,8 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "iron180.h"
#ifdef CAPSLOCK_BACKLIGHT
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
+void led_update_ports(led_t led_state) {
if (!led_state.caps_lock){
if (is_backlight_breathing()) breathing_disable();
backlight_disable();
@@ -28,6 +27,5 @@ bool led_update_kb(led_t led_state) {
if (is_backlight_breathing()) breathing_enable();
backlight_enable();
}
- return res;
}
#endif
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c
index 52059a8c40..afba2da57e 100644
--- a/keyboards/kc60/kc60.c
+++ b/keyboards/kc60/kc60.c
@@ -1,13 +1,9 @@
#include "kc60.h"
-bool led_update_kb(led_t led_state) {
- if (led_update_user(led_state)) {
- if (led_state.caps_lock) {
- setPinOutput(B2);
- } else {
- setPinInput(B2);
- }
+void led_update_ports(led_t led_state) {
+ if (led_state.caps_lock) {
+ setPinOutput(B2);
+ } else {
+ setPinInput(B2);
}
-
- return true;
}
diff --git a/keyboards/metamechs/timberwolf/timberwolf.c b/keyboards/metamechs/timberwolf/timberwolf.c
index 16aea12594..ff50851247 100644
--- a/keyboards/metamechs/timberwolf/timberwolf.c
+++ b/keyboards/metamechs/timberwolf/timberwolf.c
@@ -16,16 +16,12 @@
#include "timberwolf.h"
-bool led_update_kb(led_t led_state) {
- bool runDefault = led_update_user(led_state);
- if(runDefault) {
- if (led_state.caps_lock) {
- backlight_level_noeeprom(get_backlight_level());
- } else {
- backlight_set(0);
- }
+void led_update_ports(led_t led_state) {
+ if (led_state.caps_lock) {
+ backlight_level_noeeprom(get_backlight_level());
+ } else {
+ backlight_set(0);
}
- return runDefault;
}
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 0844f16661..1357539382 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -370,12 +370,8 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
#endif
#ifdef CAPS_LOCK_STATUS
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- ML_LED_6(led_state.caps_lock);
- }
- return res;
+void led_update_ports(led_t led_state) {
+ ML_LED_6(led_state.caps_lock);
}
#endif
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index 4ed18c114e..0e6fe08b5c 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -25,16 +25,12 @@
* Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
* Bottom LED is red only LED driver 2 RGB 6 Green channel.
*/
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- if (led_state.caps_lock) {
- IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
- } else {
- IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
- }
+void led_update_ports(led_t led_state) {
+ if (led_state.caps_lock) {
+ IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
+ } else {
+ IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
}
- return res;
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/nullbitsco/nibble/nibble.c b/keyboards/nullbitsco/nibble/nibble.c
index 43918c13e6..8f462080f0 100644
--- a/keyboards/nullbitsco/nibble/nibble.c
+++ b/keyboards/nullbitsco/nibble/nibble.c
@@ -16,10 +16,6 @@
#include QMK_KEYBOARD_H
// Use Bit-C LED to show CAPS LOCK status
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if (res) {
- set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
- }
- return res;
+void led_update_ports(led_t led_state) {
+ set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
}
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index ac29777841..b8f900ff75 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -103,12 +103,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
// Use Bit-C LED to show NUM LOCK status
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if (res) {
- set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
- }
- return res;
+void led_update_ports(led_t led_state) {
+ set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
}
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/viendi8l/viendi8l.c b/keyboards/viendi8l/viendi8l.c
index ef720ce207..6d52993342 100644
--- a/keyboards/viendi8l/viendi8l.c
+++ b/keyboards/viendi8l/viendi8l.c
@@ -23,13 +23,9 @@ uint8_t caps_color[3] = {0xFF,0xFF,0xFF};
uint8_t num_color[3] = {0xFF,0xFF,0xFF};
uint8_t layer_color[3] = {0xFF,0xFF,0xFF};
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
- led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
- }
- return res;
+void led_update_ports(led_t led_state) {
+ led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
+ led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
}
layer_state_t layer_state_set_kb(layer_state_t state) {
diff --git a/keyboards/weirdo/ls_60/ls_60.c b/keyboards/weirdo/ls_60/ls_60.c
index ef29acf9a1..12950fdba5 100644
--- a/keyboards/weirdo/ls_60/ls_60.c
+++ b/keyboards/weirdo/ls_60/ls_60.c
@@ -16,16 +16,10 @@
#include "ls_60.h"
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
-
- if (res) {
- if(led_state.caps_lock){
- rgblight_setrgb_at(192, 192, 192, 0);
- } else {
- rgblight_setrgb_at(0, 0, 0, 0);
- }
+void led_update_ports(led_t led_state) {
+ if(led_state.caps_lock){
+ rgblight_setrgb_at(192, 192, 192, 0);
+ } else {
+ rgblight_setrgb_at(0, 0, 0, 0);
}
-
- return res;
}
diff --git a/keyboards/yiancardesigns/seigaiha/seigaiha.c b/keyboards/yiancardesigns/seigaiha/seigaiha.c
index 911034eb56..02df70e2f7 100644
--- a/keyboards/yiancardesigns/seigaiha/seigaiha.c
+++ b/keyboards/yiancardesigns/seigaiha/seigaiha.c
@@ -20,17 +20,13 @@
uint8_t send_data = 0x00;
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- if (led_state.caps_lock){
- send_data |= 1 << 5;
- } else {
- send_data &= ~(1 << 5);
- }
- i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
+void led_update_ports(led_t led_state) {
+ if (led_state.caps_lock){
+ send_data |= 1 << 5;
+ } else {
+ send_data &= ~(1 << 5);
}
- return res;
+ i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {