Merge branch 'develop' into update_touch_driver

1 files changed, 8 insertions, 2 deletions

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 4ef20a2..b43b229 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -17,6 +17,12 @@ void Battery::Update() {
   isCharging = !nrf_gpio_pin_read(PinMap::Charging);
   isPowerPresent = !nrf_gpio_pin_read(PinMap::PowerPresent);
 
+  if (isPowerPresent && !isCharging) {
+    isFull = true;
+  } else if (!isPowerPresent) {
+    isFull = false;
+  }
+
   if (isReading) {
     return;
   }
@@ -63,12 +69,12 @@ 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;
 
-    if (voltage > battery_max) {
+    if (isFull) {
       percentRemaining = 100;
     } else if (voltage < battery_min) {
       percentRemaining = 0;
     } else {
-      percentRemaining = (voltage - battery_min) * 100 / (battery_max - battery_min);
+      percentRemaining = std::min((voltage - battery_min) * 100 / (battery_max - battery_min), isCharging ? 99 : 100);
     }
 
     nrfx_saadc_uninit();