mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-01 15:35:52 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7e8a64ca53
@ -20,6 +20,11 @@
|
||||
// OLED animation
|
||||
#include "./lib/logo.h"
|
||||
|
||||
// Default timeout for displaying boot logo.
|
||||
#ifndef OLED_LOGO_TIMEOUT
|
||||
#define OLED_LOGO_TIMEOUT 5000
|
||||
#endif
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
uint16_t startup_timer;
|
||||
|
||||
@ -32,16 +37,14 @@
|
||||
bool oled_task_kb(void) {
|
||||
static bool finished_logo = false;
|
||||
|
||||
if ((timer_elapsed(startup_timer) < 5000) && !finished_logo) {
|
||||
if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) {
|
||||
render_logo();
|
||||
} else {
|
||||
finished_logo = true;
|
||||
|
||||
if (!oled_task_user()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user