aboutsummaryrefslogtreecommitdiff
path: root/keyboards/shoc
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
committerNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
commit31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch)
tree12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/shoc
parentf07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff)
parentedaf8a87ef3164f8986b0a8eb171d4879b45414c (diff)
downloadqmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.tar.gz
qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.zip
Merge branch 'develop'0.22.0
Diffstat (limited to 'keyboards/shoc')
-rw-r--r--keyboards/shoc/keymaps/bongo/keymap.c2
-rw-r--r--keyboards/shoc/rules.mk1
2 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
index 14779f1d75..8f57181330 100644
--- a/keyboards/shoc/keymaps/bongo/keymap.c
+++ b/keyboards/shoc/keymaps/bongo/keymap.c
@@ -163,7 +163,7 @@ bool oled_task_user(void) {
oled_set_cursor(0,6);
oled_write_P(PSTR(" WPM: "), false);
oled_write(get_u8_str(get_current_wpm(), '0'), false);
- if(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)){
+ if(host_keyboard_led_state().caps_lock){
oled_set_cursor(0,5);
oled_write_P(PSTR(" CAPS LOCK"), false);
}
diff --git a/keyboards/shoc/rules.mk b/keyboards/shoc/rules.mk
index 806df50421..5d17ed9492 100644
--- a/keyboards/shoc/rules.mk
+++ b/keyboards/shoc/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
WPM_ENABLE = yes