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

Revert "added low battery message"

Browse Source 
This reverts PR https://github.com/InfiniTimeOrg/InfiniTime/pull/1352
This commit is contained in:
Riku Isokoski
2022-12-31 09:56:03 +02:00
parent 3b084d74c3
commit fff0a00a4a
5 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,20 +81,10 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
newPercent = std::min(approx.GetValue(voltage), isCharging ? uint8_t {99} : uint8_t {100});
}
if (isPowerPresent) {
batteryLowNotified = false;
}
if ((isPowerPresent && newPercent > percentRemaining) || (!isPowerPresent && newPercent < percentRemaining) || firstMeasurement) {
firstMeasurement = false;
percentRemaining = newPercent;
systemTask->PushMessage(System::Messages::BatteryPercentageUpdated);
// warn about low battery when not charging and below threshold
if (BatteryIsLow() && !isPowerPresent && !batteryLowNotified) {
systemTask->PushMessage(System::Messages::LowBattery);
batteryLowNotified = true;
}
}
nrfx_saadc_uninit();

7
src/components/battery/BatteryController.h
View File

@@ -18,10 +18,6 @@ namespace Pinetime {
return percentRemaining;
}
bool BatteryIsLow() const {
return percentRemaining <= lowBatteryThreshold;
}
uint16_t Voltage() const {
return voltage;
}
@@ -43,7 +39,6 @@ namespace Pinetime {
static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
uint16_t voltage = 0;
uint8_t percentRemaining = 0;
bool batteryLowNotified = false;
bool isFull = false;
bool isCharging = false;
@@ -55,8 +50,6 @@ namespace Pinetime {
void SaadcEventHandler(nrfx_saadc_evt_t const* p_event);
static void AdcCallbackStatic(nrfx_saadc_evt_t const* event);
static constexpr uint8_t lowBatteryThreshold {15};
bool isReading = false;
Pinetime::System::SystemTask* systemTask = nullptr;