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

Fixed formatting

Browse Source
This commit is contained in:
CommanderRedYT
2022-06-23 20:04:51 +02:00
parent 0393ac750b
commit 55386b5fb3
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
main/displays/speedinfodisplay.cpp
View File

@ -44,13 +44,16 @@ void SpeedInfoDisplay::redraw()
tft.setTextSize(1); tft.setTextSize(1);
m_batteryPercentLabel.redraw(getBatteryPercentageString()); m_batteryPercentLabel.redraw(getBatteryPercentageString());
if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage) { if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
{
auto watt = sumCurrent * *avgVoltage; auto watt = sumCurrent * *avgVoltage;
auto wh_per_km = std::abs(avgSpeedKmh) > 0.1 ? watt / std::abs(avgSpeedKmh) : 0; auto wh_per_km = std::abs(avgSpeedKmh) > 0.1 ? watt / std::abs(avgSpeedKmh) : 0;
m_voltageLabel.redraw(fmt::format("{:.1f} V", avgVoltage.value())); m_voltageLabel.redraw(fmt::format("{:.1f} V", avgVoltage.value()));
m_currentConsumptionLabel.redraw(fmt::format("{:.1f} Wh/km", wh_per_km)); m_currentConsumptionLabel.redraw(fmt::format("{:.1f} Wh/km", wh_per_km));
} else { }
else
{
m_voltageLabel.redraw("No voltage"); m_voltageLabel.redraw("No voltage");
m_currentConsumptionLabel.redraw("No comsumption"); m_currentConsumptionLabel.redraw("No comsumption");
} }
@ -72,21 +75,22 @@ void SpeedInfoDisplay::buttonPressed(espgui::Button button)
{ {
Base::buttonPressed(button); Base::buttonPressed(button);
switch (button) { switch (button)
using espgui::Button; {
case Button::Right: using espgui::Button;
espgui::pushScreen<MainMenu>(); case Button::Right:
break; espgui::pushScreen<MainMenu>();
case Button::Up: break;
espgui::switchScreen<BatteryInfoDisplay>(); case Button::Up:
break; espgui::switchScreen<BatteryInfoDisplay>();
case Button::Down: break;
case Button::Down:
#ifdef FEATURE_BMS #ifdef FEATURE_BMS
espgui::switchScreen<BmsDisplay>(); espgui::switchScreen<BmsDisplay>();
#else #else
espgui::switchScreen<StatusDisplay>(); espgui::switchScreen<StatusDisplay>();
#endif #endif
break; break;
default:; default:;
} }
} }