pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 18:59:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1349 from meshtastic/patch-1

Browse Source 
adjust for serial wait time during nRF52 bootup
This commit is contained in:
Thomas Göttgens 2022-04-02 16:25:57 +02:00 committed by GitHub
commit a8ef3967cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/Screen.cpp
View File

@ -854,8 +854,9 @@ int32_t Screen::runOnce()
}
// Show boot screen for first 3 seconds, then switch to normal operation.
// serialSinceMsec adjusts for additional serial wait time during nRF52 bootup
static bool showingBootScreen = true;
if (showingBootScreen && (millis() > 5000)) {
if (showingBootScreen && (millis() > (5000 + serialSinceMsec))) {
DEBUG_MSG("Done with boot screen...\n");
stopBootScreen();
showingBootScreen = false;

4
src/main.cpp
View File

@ -78,6 +78,8 @@ uint8_t cardkb_found;
// The I2C address of the Faces Keyboard (if found)
uint8_t faceskb_found;
uint32_t serialSinceMsec;
bool axp192_found;
Router *router = NULL; // Users of router don't care what sort of subclass implements that API
@ -141,6 +143,8 @@ void setup()
consoleInit(); // Set serial baud rate and init our mesh console
}
#endif
serialSinceMsec = millis();
DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");

2
src/main.h
View File

@ -30,6 +30,8 @@ extern uint32_t timeLastPowered;
extern uint32_t rebootAtMsec;
extern uint32_t shutdownAtMsec;
extern uint32_t serialSinceMsec;
// If a thread does something that might need for it to be rescheduled ASAP it can set this flag
// This will supress the current delay and instead try to run ASAP.
extern bool runASAP;