diff options
Diffstat (limited to 'users/drashna/oled_stuff.c')
-rw-r--r-- | users/drashna/oled_stuff.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c index b2f49a2e7e..103b1fc7a7 100644 --- a/users/drashna/oled_stuff.c +++ b/users/drashna/oled_stuff.c @@ -141,10 +141,8 @@ void render_keylock_status(uint8_t led_usb_state) { oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state & (1 << USB_LED_CAPS_LOCK)); oled_write_P(PSTR(" "), false); oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state & (1 << USB_LED_SCROLL_LOCK)); -#ifndef OLED_DISPLAY_128X64 - oled_advance_page(true); -#endif } + void render_matrix_scan_rate(void) { #ifdef DEBUG_MATRIX_SCAN_RATE char matrix_rate[5]; @@ -315,12 +313,11 @@ void render_wpm(void) { } #if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right) -extern keyboard_config_t keyboard_config; -extern uint16_t dpi_array[]; +extern kb_runtime_config_t kb_state; void render_pointing_dpi_status(void) { char dpi_status[6]; - uint16_t n = dpi_array[keyboard_config.dpi_config]; + uint16_t n = kb_state.device_cpi; dpi_status[5] = '\0'; dpi_status[4] = '0' + n % 10; dpi_status[3] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' '; @@ -340,7 +337,9 @@ void render_status_secondary(void) { render_default_layer_state(); render_layer_state(); render_mod_status(get_mods() | get_oneshot_mods()); - +#if !defined(OLED_DISPLAY_128X64) && defined(WPM_ENABLE) + render_wpm(); +#endif // render_keylock_status(host_keyboard_leds()); } @@ -349,7 +348,7 @@ void render_status_main(void) { oled_driver_render_logo(); # ifdef DEBUG_MATRIX_SCAN_RATE render_matrix_scan_rate(); -# else +# elif defined(WPM_ENABLE) render_wpm(); # endif # if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right) |