From 6f3861fac537a9424f8b8a7b735f1afafe9b4755 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 16 Nov 2021 17:44:49 -0800
Subject: [PATCH] [Keyboard] Fix oled_task_user for ffkeebs/puca (#15185)
---
keyboards/ffkeebs/puca/puca.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/keyboards/ffkeebs/puca/puca.c b/keyboards/ffkeebs/puca/puca.c
index e08ac0cb3b..d131b97f7c 100644
--- a/keyboards/ffkeebs/puca/puca.c
+++ b/keyboards/ffkeebs/puca/puca.c
@@ -29,7 +29,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
// OLED
#ifdef OLED_ENABLE
__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-__attribute__((weak)) void oled_task_user(void) {
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
// WPM-responsive animation stuff here
# define IDLE_FRAMES 2
# define ANIM_FRAME_DURATION 400 // how long each frame lasts in ms
@@ -105,7 +106,7 @@ __attribute__((weak)) void oled_task_user(void) {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}};
-
+
void animation_phase(void) {
current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
@@ -114,7 +115,7 @@ __attribute__((weak)) void oled_task_user(void) {
anim_timer = timer_read32();
animation_phase();
}
-
+
oled_set_cursor(0, 6);
oled_write_P(PSTR("PUCA\nPAD\n"), false);
oled_write_P(PSTR("-----\n"), false);
@@ -129,5 +130,6 @@ __attribute__((weak)) void oled_task_user(void) {
oled_write_P(PSTR("FUNC\n"), false);
break;
}
+ return true;
}
-#endif
\ No newline at end of file
+#endif