CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve battery percentage calculation and reporting

Browse Source 
While charging, percentage should only go up, and while discharging,
percentage should only go down.
This commit is contained in:
Riku Isokoski
2021-10-04 01:41:38 +03:00
parent b84a546920
commit a9f7153fdf
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/battery/BatteryController.cpp
View File

@@ -69,18 +69,23 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
// p_event->data.done.p_buffer[0] = (adc_voltage / reference_voltage) * 1024
voltage = p_event->data.done.p_buffer[0] * (8 * 600) / 1024;
uint8_t newPercent;
if (isFull) {
percentRemaining = 100;
newPercent = 100;
} else if (voltage < battery_min) {
percentRemaining = 0;
newPercent = 0;
} else {
percentRemaining = std::min((voltage - battery_min) * 100 / (battery_max - battery_min), isCharging ? 99 : 100);
newPercent = std::min((voltage - battery_min) * 100 / (battery_max - battery_min), isCharging ? 99 : 100);
}
if ((isPowerPresent && newPercent > percentRemaining) || (!isPowerPresent && newPercent < percentRemaining) || firstMeasurement) {
firstMeasurement = false;
percentRemaining = newPercent;
systemTask->PushMessage(System::Messages::BatteryPercentageUpdated);
}
nrfx_saadc_uninit();
isReading = false;
systemTask->PushMessage(System::Messages::BatteryMeasurementDone);
}
}