Merge remote-tracking branch 'upstream/develop' into pts-settings

1 files changed, 15 insertions, 6 deletions

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index b43b229..e807f03 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -13,7 +13,7 @@ Battery::Battery() {
   nrf_gpio_cfg_input(PinMap::Charging, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Disabled);
 }
 
-void Battery::Update() {
+void Battery::ReadPowerState() {
   isCharging = !nrf_gpio_pin_read(PinMap::Charging);
   isPowerPresent = !nrf_gpio_pin_read(PinMap::PowerPresent);
 
@@ -22,6 +22,10 @@ void Battery::Update() {
   } else if (!isPowerPresent) {
     isFull = false;
   }
+}
+
+void Battery::MeasureVoltage() {
+  ReadPowerState();
 
   if (isReading) {
     return;
@@ -69,18 +73,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);
   }
 }