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

Dev commit

Browse Source
This commit is contained in:
CommanderRedYT
2022-10-06 22:37:31 +02:00
parent 4e0fdd65c3
commit 9db3da4b27
17 changed files with 267 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/main.cpp
View File

@ -35,6 +35,7 @@ using namespace std::chrono_literals;
#include "displays/lockscreen.h"
#include "displays/menus/recoverymenu.h"
#include "displays/potiscalibratedisplay.h"
#include "displays/setupdisplay.h"
#include "displays/statusdisplay.h"
#include "newsettings.h"
#include "taskmanager.h"
@ -130,12 +131,9 @@ extern "C" void app_main()
bootLabel.redraw("switchScreen");
if (configs.dpadMappingLeft.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingRight.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingUp.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingDown.value() == INPUT_MAPPING_NONE)
if (const auto result = checkIfInCalibration(); result)
{
espgui::switchScreen<ButtonCalibrateDisplay>(true);
espgui::switchScreen<SetupDisplay>(*result);
}
else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value())
{
@ -144,12 +142,7 @@ extern "C" void app_main()
}
else
{
if (!gas || !brems || *gas > 200.f || *brems > 200.f)
espgui::switchScreen<PotisCalibrateDisplay>(true);
else
{
espgui::switchScreen<StatusDisplay>();
}
espgui::switchScreen<StatusDisplay>();
}
esp_chip_info(&chip_info);