will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add percentage rescaling

Browse Source
This commit is contained in:
minacode 2022-10-03 14:22:18 +02:00 committed by JF
parent 5f5c771752
commit 59ee0ad1aa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,11 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
if (!isFull) { if (!isFull) {
newPercent = std::min(aprox.GetValue(voltage), isCharging ? uint8_t {99} : uint8_t {100}); newPercent = std::min(aprox.GetValue(voltage), isCharging ? uint8_t {99} : uint8_t {100});
} }
// quick hack for better values
// rescale the percentages between 35 and 100
constexpr uint8_t realMin = 35;
newPercent = std::max(newPercent, realMin);
newPercent = (newPercent - realMin) * 100 / (100 - realMin);
if ((isPowerPresent && newPercent > percentRemaining) || (!isPowerPresent && newPercent < percentRemaining) || firstMeasurement) { if ((isPowerPresent && newPercent > percentRemaining) || (!isPowerPresent && newPercent < percentRemaining) || firstMeasurement) {
firstMeasurement = false; firstMeasurement = false;
@ -93,7 +98,8 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
systemTask->PushMessage(System::Messages::BatteryPercentageUpdated); systemTask->PushMessage(System::Messages::BatteryPercentageUpdated);
} }
constexpr uint8_t lowBatteryThreshold {50}; // warn at 20% battery (wrt. rescaling above)
constexpr uint8_t lowBatteryThreshold {20};
if (!isPowerPresent && lastPercentRemaining >= lowBatteryThreshold && percentRemaining < lowBatteryThreshold) { if (!isPowerPresent && lastPercentRemaining >= lowBatteryThreshold && percentRemaining < lowBatteryThreshold) {
systemTask->PushMessage(System::Messages::LowBattery); systemTask->PushMessage(System::Messages::LowBattery);
} }