kopia lustrzana https://github.com/meshtastic/firmware
adjust for serial wait time during nRF52 bootup
rodzic
fd407a2a9e
commit
364d81e906
|
@ -854,8 +854,9 @@ int32_t Screen::runOnce()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show boot screen for first 3 seconds, then switch to normal operation.
|
// 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;
|
static bool showingBootScreen = true;
|
||||||
if (showingBootScreen && (millis() > 5000)) {
|
if (showingBootScreen && (millis() > (5000 + serialSinceMsec))) {
|
||||||
DEBUG_MSG("Done with boot screen...\n");
|
DEBUG_MSG("Done with boot screen...\n");
|
||||||
stopBootScreen();
|
stopBootScreen();
|
||||||
showingBootScreen = false;
|
showingBootScreen = false;
|
||||||
|
|
|
@ -78,6 +78,8 @@ uint8_t cardkb_found;
|
||||||
// The I2C address of the Faces Keyboard (if found)
|
// The I2C address of the Faces Keyboard (if found)
|
||||||
uint8_t faceskb_found;
|
uint8_t faceskb_found;
|
||||||
|
|
||||||
|
uint32_t serialSinceMsec;
|
||||||
|
|
||||||
bool axp192_found;
|
bool axp192_found;
|
||||||
|
|
||||||
Router *router = NULL; // Users of router don't care what sort of subclass implements that API
|
Router *router = NULL; // Users of router don't care what sort of subclass implements that API
|
||||||
|
@ -142,6 +144,8 @@ void setup()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
serialSinceMsec = millis();
|
||||||
|
|
||||||
DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");
|
DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");
|
||||||
|
|
||||||
initDeepSleep();
|
initDeepSleep();
|
||||||
|
|
|
@ -30,6 +30,8 @@ extern uint32_t timeLastPowered;
|
||||||
extern uint32_t rebootAtMsec;
|
extern uint32_t rebootAtMsec;
|
||||||
extern uint32_t shutdownAtMsec;
|
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
|
// 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.
|
// This will supress the current delay and instead try to run ASAP.
|
||||||
extern bool runASAP;
|
extern bool runASAP;
|
||||||
|
|
Ładowanie…
Reference in New Issue