Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-08-30 00:34:44 +00:00
commit 7e8a64ca53

View File

@ -20,6 +20,11 @@
// OLED animation // OLED animation
#include "./lib/logo.h" #include "./lib/logo.h"
// Default timeout for displaying boot logo.
#ifndef OLED_LOGO_TIMEOUT
#define OLED_LOGO_TIMEOUT 5000
#endif
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
uint16_t startup_timer; uint16_t startup_timer;
@ -32,16 +37,14 @@
bool oled_task_kb(void) { bool oled_task_kb(void) {
static bool finished_logo = false; 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(); render_logo();
} else { } else {
finished_logo = true; finished_logo = true;
if (!oled_task_user()) { if (!oled_task_user()) {
return false; return false;
} }
} }
return true; return true;
} }
#endif #endif