From 7ff80a57cbe57e888646c3b90e2f4f9dea977156 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Jul 2023 04:24:22 +1000 Subject: Get rid of `USB_LED_SCROLL_LOCK` (#21405) --- .../bpiphany/kitten_paw/keymaps/ickerwx/keymap.c | 21 ------ .../cannonkeys/satisfaction75/satisfaction75.c | 8 +-- .../ckeys/washington/keymaps/default/keymap.c | 8 +-- keyboards/converter/ibm_terminal/led.c | 9 +-- keyboards/crkbd/keymaps/oled_sample/keymap.c | 10 +-- keyboards/crkbd/lib/host_led_state_reader.c | 8 +-- keyboards/duck/octagon/v1/v1.c | 4 +- keyboards/duck/octagon/v2/v2.c | 10 +-- keyboards/duck/tcv3/tcv3.c | 83 ---------------------- .../ergodox_ez/keymaps/bepo_tm_style/keymap.c | 20 +++--- keyboards/gh80_3000/keymaps/ansi_std/keymap.c | 28 +++++--- keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c | 40 ++++++----- keyboards/gh80_3000/keymaps/default/keymap.c | 28 +++++--- keyboards/gh80_3000/keymaps/iso_default/keymap.c | 28 +++++--- keyboards/gh80_3000/keymaps/iso_std/keymap.c | 40 ++++++----- keyboards/gh80_3000/keymaps/iso_wkl/keymap.c | 40 ++++++----- .../handwired/datahand/keymaps/default/keymap.c | 9 +-- keyboards/handwired/jopr/keymaps/default/keymap.c | 9 +-- .../handwired/jopr/keymaps/modded_white/keymap.c | 9 +-- keyboards/handwired/myskeeb/oled.c | 10 +-- keyboards/helix/rev2/keymaps/edvorakjp/oled.c | 8 +-- .../helix/rev2/keymaps/five_rows_jis/keymap.c | 8 +-- keyboards/helix/rev2/keymaps/froggy/keymap.c | 14 ++-- keyboards/helix/rev2/keymaps/froggy_106/keymap.c | 14 ++-- keyboards/helix/rev2/keymaps/yshrsmz/keymap.c | 20 +++--- keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c | 7 +- keyboards/hineybush/hbcp/hbcp.c | 46 +++++++----- keyboards/hineybush/hbcp/keymaps/hiney/keymap.c | 9 +-- .../romac_plus/keymaps/default/keymap.c | 8 +-- .../marksard/treadstone48/common/oled_helper.c | 8 +-- keyboards/matrix/noah/noah.c | 8 +-- .../snap/keymaps/bongo_reactive/keymap.c | 14 ++-- keyboards/nullbitsco/snap/keymaps/oled/keymap.c | 14 ++-- keyboards/nullbitsco/snap/keymaps/typehud/keymap.c | 14 ++-- .../tidbit/keymaps/snailmap_lite/keymap.c | 8 +-- keyboards/orange75/keymaps/default/keymap.c | 9 +-- keyboards/planck/keymaps/vaire/keymap.c | 19 ++--- keyboards/plut0nium/0x3e/keymaps/default/keymap.c | 8 --- keyboards/primekb/prime_e/keymaps/default/keymap.c | 14 ++-- keyboards/primekb/prime_e/keymaps/via/keymap.c | 14 ++-- keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c | 8 +-- keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c | 8 +-- keyboards/rgbkb/sol/keymaps/default/keymap.c | 8 +-- keyboards/rgbkb/sol/keymaps/xyverz/keymap.c | 8 +-- keyboards/rgbkb/zen/rev2/rev2.c | 8 +-- keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c | 7 +- .../rgbkb/zygomorph/keymaps/default_oled/keymap.c | 8 +-- keyboards/satt/comet46/lib/host_led_state_reader.c | 8 +-- keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c | 8 +-- keyboards/splitkb/kyria/keymaps/shinze/keymap.c | 8 +-- keyboards/splitkb/kyria/keymaps/tessachka/keymap.c | 8 +-- .../splitkb/kyria/keymaps/thomasbaart/keymap.c | 8 +-- keyboards/viktus/at101_bh/keymaps/default/keymap.c | 9 +-- .../viktus/omnikey_bh/keymaps/default/keymap.c | 9 +-- keyboards/yosino58/lib/host_led_state_reader.c | 8 +-- 55 files changed, 365 insertions(+), 442 deletions(-) (limited to 'keyboards') diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c index c0439912ff..f0c75284f7 100644 --- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c +++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c @@ -3,8 +3,6 @@ #define MEDAPP LT(MEDIA, KC_APP) -uint8_t current_layer_global = 255; - enum layers { DEFAULT, PROG1, @@ -87,25 +85,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______,_______,_______, LT(MISC, KC_SPC), _______,_______,_______,_______, _______,_______,_______, _______,_______), }; -void matrix_scan_user(void) { - uint8_t layer; - layer = get_highest_layer(layer_state); - - if (current_layer_global != layer) { - current_layer_global = layer; - - // unset CAPSLOCK and SCROLL LOCK LEDs - led_set(host_keyboard_leds() & ~(1<event.pressed) { if (record->tap.count > 0 && !record->tap.interrupted) { diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index ce870c49af..29fb6e7619 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -243,22 +243,22 @@ void via_custom_value_command(uint8_t *data, uint8_t length) { void read_host_led_state(void) { - uint8_t leds = host_keyboard_leds(); - if (leds & (1 << USB_LED_NUM_LOCK)) { + led_t led_state = host_keyboard_led_state(); + if (led_state.num_lock) { if (led_numlock == false){ led_numlock = true;} } else { if (led_numlock == true){ led_numlock = false;} } - if (leds & (1 << USB_LED_CAPS_LOCK)) { + if (led_state.caps_lock) { if (led_capslock == false){ led_capslock = true;} } else { if (led_capslock == true){ led_capslock = false;} } - if (leds & (1 << USB_LED_SCROLL_LOCK)) { + if (led_state.scroll_lock) { if (led_scrolllock == false){ led_scrolllock = true;} } else { diff --git a/keyboards/ckeys/washington/keymaps/default/keymap.c b/keyboards/ckeys/washington/keymaps/default/keymap.c index 9ce0181fe4..8e1eb0e272 100644 --- a/keyboards/ckeys/washington/keymaps/default/keymap.c +++ b/keyboards/ckeys/washington/keymaps/default/keymap.c @@ -75,10 +75,10 @@ bool oled_task_user(void) { } // Host Keyboard LED Status - uint8_t usb_led = host_keyboard_leds(); - oled_write_P(IS_LED_ON(usb_led, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); - oled_write_P(IS_LED_ON(usb_led, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); - oled_write_P(IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); + led_t led_state = host_keyboard_led_state(); + oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); return false; } #endif diff --git a/keyboards/converter/ibm_terminal/led.c b/keyboards/converter/ibm_terminal/led.c index e0f31ee4e1..1bcde277a2 100644 --- a/keyboards/converter/ibm_terminal/led.c +++ b/keyboards/converter/ibm_terminal/led.c @@ -20,14 +20,15 @@ along with this program. If not, see . #include "led.h" -void led_set(uint8_t usb_led) +bool led_update_kb(led_t led_state) { uint8_t ps2_led = 0; - if (usb_led & (1<event.key.col, keycode, name, - (leds & (1<