mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-22 17:34:25 +00:00
fix: don't use the full shutdown screen during reboot
This commit is contained in:
parent
43d61a550c
commit
1368956a57
@ -108,6 +108,19 @@ void InkHUD::LogoApplet::onShutdown()
|
|||||||
// This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
|
// This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InkHUD::LogoApplet::onReboot()
|
||||||
|
{
|
||||||
|
bringToForeground();
|
||||||
|
|
||||||
|
textLeft = "";
|
||||||
|
textRight = "";
|
||||||
|
textTitle = "Rebooting...";
|
||||||
|
fontTitle = fontSmall;
|
||||||
|
|
||||||
|
inkhud->forceUpdate(Drivers::EInk::FULL, false);
|
||||||
|
// Perform the update right now, waiting here until complete
|
||||||
|
}
|
||||||
|
|
||||||
int32_t InkHUD::LogoApplet::runOnce()
|
int32_t InkHUD::LogoApplet::runOnce()
|
||||||
{
|
{
|
||||||
sendToBackground();
|
sendToBackground();
|
||||||
|
@ -25,6 +25,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
|
|||||||
void onForeground() override;
|
void onForeground() override;
|
||||||
void onBackground() override;
|
void onBackground() override;
|
||||||
void onShutdown() override;
|
void onShutdown() override;
|
||||||
|
void onReboot() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int32_t runOnce() override;
|
int32_t runOnce() override;
|
||||||
|
@ -111,16 +111,16 @@ int InkHUD::Events::beforeReboot(void *unused)
|
|||||||
a->onDeactivate();
|
a->onDeactivate();
|
||||||
a->onShutdown();
|
a->onShutdown();
|
||||||
}
|
}
|
||||||
for (Applet *sa : inkhud->systemApplets) {
|
for (SystemApplet *sa : inkhud->systemApplets) {
|
||||||
// Note: no onDeactivate. System applets are always active.
|
// Note: no onDeactivate. System applets are always active.
|
||||||
sa->onShutdown();
|
sa->onReboot();
|
||||||
}
|
}
|
||||||
|
|
||||||
inkhud->persistence->saveSettings();
|
inkhud->persistence->saveSettings();
|
||||||
inkhud->persistence->saveLatestMessage();
|
inkhud->persistence->saveLatestMessage();
|
||||||
|
|
||||||
// Note: no forceUpdate call here
|
// Note: no forceUpdate call here
|
||||||
// Because OSThread will not be given another chance to run before reboot, this means that no display update will occur
|
// We don't have any final screen to draw, although LogoApplet::onReboot did already display a "rebooting" screen
|
||||||
|
|
||||||
return 0; // No special status to report. Ignored anyway by this Observable
|
return 0; // No special status to report. Ignored anyway by this Observable
|
||||||
}
|
}
|
||||||
|
@ -26,6 +26,8 @@ class SystemApplet : public Applet
|
|||||||
bool lockRendering = false; // - prevent other applets from being rendered during an update
|
bool lockRendering = false; // - prevent other applets from being rendered during an update
|
||||||
bool lockRequests = false; // - prevent other applets from triggering display updates
|
bool lockRequests = false; // - prevent other applets from triggering display updates
|
||||||
|
|
||||||
|
virtual void onReboot() { onShutdown(); } // - handle reboot specially
|
||||||
|
|
||||||
// Other system applets may take precedence over our own system applet though
|
// Other system applets may take precedence over our own system applet though
|
||||||
// The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)
|
// The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user