From 829e88eb03f813b1e927b92d5d4a0088485c9b01 Mon Sep 17 00:00:00 2001 From: GoLWD <59450915+GoLWD@users.noreply.github.com> Date: Thu, 31 Mar 2022 01:00:30 +0200 Subject: [PATCH] Fix conflicting typ error for oled_task_user. (#136) --- keyboards/sofle/keymaps/vial/oled.c | 5 +++-- keyboards/sofle/keymaps/vial/rules.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/sofle/keymaps/vial/oled.c b/keyboards/sofle/keymaps/vial/oled.c index 06839da170..331425df75 100644 --- a/keyboards/sofle/keymaps/vial/oled.c +++ b/keyboards/sofle/keymaps/vial/oled.c @@ -17,7 +17,7 @@ //Sets up what the OLED screens display. -#ifdef OLED_DRIVER_ENABLE +#ifdef OLED_ENABLE static void render_logo(void) { static const char PROGMEM qmk_logo[] = { @@ -73,12 +73,13 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { return rotation; } -void oled_task_user(void) { +bool oled_task_user(void) { if (is_keyboard_master()) { print_status_narrow(); } else { render_logo(); } + return false; } #endif \ No newline at end of file diff --git a/keyboards/sofle/keymaps/vial/rules.mk b/keyboards/sofle/keymaps/vial/rules.mk index 7a7b730b12..4846f7fca1 100644 --- a/keyboards/sofle/keymaps/vial/rules.mk +++ b/keyboards/sofle/keymaps/vial/rules.mk @@ -1,4 +1,4 @@ -OLED_DRIVER_ENABLE = yes +OLED_ENABLE = yes ENCODER_ENABLE = yes CONSOLE_ENABLE = no EXTRAKEY_ENABLE = yes