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

Refactored voltage readings

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-27 01:09:52 +01:00
parent 23e94b213f
commit e3640046c0
11 changed files with 102 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/drivingstatistics.cpp
View File

@@ -97,17 +97,13 @@ void calculateStatistics()
}
drivingStatistics.currentDrivingTime += duration;
float avgVoltage = 0;
for (auto &controller : controllers)
if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
{
avgVoltage += controller.getCalibratedVoltage();
auto watt = sumCurrent * *avgVoltage;
const float ws_driven_now = watt * (duration.count() / 1000.);
drivingStatistics.wh_used += ws_driven_now / 3600; // Wh
drivingStatistics.batteryWhEstimate -= ws_driven_now / 3600;
}
avgVoltage = avgVoltage / controllers.size();
auto watt = sumCurrent * avgVoltage;
const float ws_driven_now = watt * (duration.count() / 1000.);
drivingStatistics.wh_used += ws_driven_now / 3600; // Wh
drivingStatistics.batteryWhEstimate -= ws_driven_now / 3600;
}
else
{