feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #336 from bobbycar-graz/lockscreen-fix

Browse Source
This commit is contained in:
CommanderRedYT
2022-06-12 17:36:17 +01:00
committed by GitHub
parent a1d51c3f2a a9905232c6
commit f6bc1f5dbd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/displays/lockscreen.cpp
View File

@ -121,7 +121,7 @@ LOCKSCREEN_PLUGIN_FIXES_1
if (!gas || !brems || *gas > 200.f || *brems > 200.f) if (!gas || !brems || *gas > 200.f || *brems > 200.f)
espgui::switchScreen<PotisCalibrateDisplay>(true); espgui::switchScreen<PotisCalibrateDisplay>(true);
else else
espgui::switchScreen<MainMenu>(); espgui::popScreen();
#ifdef LOCKSCREEN_PLUGIN_FIXES_2 #ifdef LOCKSCREEN_PLUGIN_FIXES_2
LOCKSCREEN_PLUGIN_FIXES_2 LOCKSCREEN_PLUGIN_FIXES_2
#endif #endif

3
main/main.cpp
View File

@ -93,7 +93,8 @@ extern "C" void app_main()
} }
else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value()) else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value())
{ {
espgui::switchScreen<Lockscreen>(); espgui::switchScreen<StatusDisplay>();
espgui::pushScreen<Lockscreen>();
} }
else else
{ {