1
0
Fork 0

[Keyboard] Fix oled_task_user for ffkeebs/puca (#15185)

This commit is contained in:
Drashna Jaelre 2021-11-16 17:44:49 -08:00 committed by GitHub
parent 0bcf5fb0f2
commit 6f3861fac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -29,7 +29,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
// OLED // OLED
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; } __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 // WPM-responsive animation stuff here
# define IDLE_FRAMES 2 # define IDLE_FRAMES 2
# define ANIM_FRAME_DURATION 400 // how long each frame lasts in ms # 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,
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) { void animation_phase(void) {
current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES; current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE); 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(); anim_timer = timer_read32();
animation_phase(); animation_phase();
} }
oled_set_cursor(0, 6); oled_set_cursor(0, 6);
oled_write_P(PSTR("PUCA\nPAD\n"), false); oled_write_P(PSTR("PUCA\nPAD\n"), false);
oled_write_P(PSTR("-----\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); oled_write_P(PSTR("FUNC\n"), false);
break; break;
} }
return true;
} }
#endif #endif