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

Fixed project for new submodules

Browse Source
This commit is contained in:
CommanderRedYT
2022-04-29 22:40:49 +02:00
parent 84a1cd40e9
commit 91880608dc
66 changed files with 632 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/main.cpp
View File

@@ -80,14 +80,14 @@ 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 (configs.dpadMappingLeft.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingRight.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingUp.value() == INPUT_MAPPING_NONE ||
configs.dpadMappingDown.value() == INPUT_MAPPING_NONE)
{
espgui::switchScreen<ButtonCalibrateDisplay>(true);
}
else if (configs.lockscreen.keepLockedAfterReboot.value && configs.lockscreen.locked.value)
else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value())
{
espgui::switchScreen<Lockscreen>();
}
@@ -114,7 +114,7 @@ extern "C" void app_main()
schedulerTask.loop();
}
if (!lastStatsUpdate || now - *lastStatsUpdate >= 1000ms/configs.boardcomputerHardware.timersSettings.statsUpdateRate.value)
if (!lastStatsUpdate || now - *lastStatsUpdate >= 1000ms/configs.boardcomputerHardware.timersSettings.statsUpdateRate.value())
{
updateAccumulators();
pushStats();
@@ -136,7 +136,7 @@ extern "C" void app_main()
{
if (avgVoltage > 30)
{
battery::bootBatPercentage = getBatteryPercentage(*avgVoltage, BatteryCellType(configs.battery.cellType.value));
battery::bootBatPercentage = getBatteryPercentage(*avgVoltage, BatteryCellType(configs.battery.cellType.value()));
battery::bootBatWh = getRemainingWattHours();
}
}