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

Merge pull request #348 from bobbycar-graz/peter_screen_improvements

Browse Source 
Speed screen improvements
This commit is contained in:
Peter Pötzi
2022-09-17 17:55:45 +02:00
committed by GitHub
parent 72c1e959a1 f18a057411
commit f5d6535db9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/displays/speedinfodisplay.cpp
View File

@ -22,7 +22,7 @@ void SpeedInfoDisplay::initScreen()
m_batteryPercentLabel.start(); m_batteryPercentLabel.start();
m_voltageLabel.start(); m_voltageLabel.start();
m_distanceLabel.start(); m_distanceLabel.start();
m_currentConsumptionLabel.start(); m_currentPowerLabel.start();
} }
void SpeedInfoDisplay::redraw() void SpeedInfoDisplay::redraw()
@ -46,15 +46,16 @@ void SpeedInfoDisplay::redraw()
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;
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)); tft.setTextSize(2);
m_currentPowerLabel.redraw(fmt::format("{:.0f} W", watt));
tft.setTextSize(1);
} }
else else
{ {
m_voltageLabel.redraw("No voltage"); m_voltageLabel.redraw("No voltage");
m_currentConsumptionLabel.redraw("No comsumption"); m_currentPowerLabel.redraw("No power");
} }
m_distanceLabel.redraw( m_distanceLabel.redraw(

2
main/displays/speedinfodisplay.h
View File

@ -28,5 +28,5 @@ private:
espgui::Label m_batteryPercentLabel{5, START_Y}; espgui::Label m_batteryPercentLabel{5, START_Y};
espgui::Label m_voltageLabel{5, START_Y + 29 * 1}; espgui::Label m_voltageLabel{5, START_Y + 29 * 1};
espgui::Label m_distanceLabel{5, START_Y + 29 * 2}; espgui::Label m_distanceLabel{5, START_Y + 29 * 2};
espgui::Label m_currentConsumptionLabel{5, START_Y + 29 * 3}; espgui::Label m_currentPowerLabel{5, START_Y + 29 * 3};
}; };