1 files changed, 31 insertions, 23 deletions

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index fa476ea3..b43b229f 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -1,4 +1,5 @@
 #include "BatteryController.h"
+#include "drivers/PinMap.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_saadc.h>
 #include <algorithm>
@@ -9,21 +10,23 @@ Battery* Battery::instance = nullptr;
 
 Battery::Battery() {
   instance = this;
-}
-
-void Battery::Init() {
-  nrf_gpio_cfg_input(chargingPin, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Pullup);
+  nrf_gpio_cfg_input(PinMap::Charging, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Disabled);
 }
 
 void Battery::Update() {
-  isCharging = !nrf_gpio_pin_read(chargingPin);
-  isPowerPresent = !nrf_gpio_pin_read(powerPresentPin);
+  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;
   }
   // Non blocking read
-  samples = 0;
   isReading = true;
   SaadcInit();
 
@@ -40,9 +43,9 @@ void Battery::SaadcInit() {
 
   nrf_saadc_channel_config_t adcChannelConfig = {.resistor_p = NRF_SAADC_RESISTOR_DISABLED,
                                                  .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
-                                                 .gain = NRF_SAADC_GAIN1_5,
+                                                 .gain = NRF_SAADC_GAIN1_4,
                                                  .reference = NRF_SAADC_REFERENCE_INTERNAL,
-                                                 .acq_time = NRF_SAADC_ACQTIME_3US,
+                                                 .acq_time = NRF_SAADC_ACQTIME_40US,
                                                  .mode = NRF_SAADC_MODE_SINGLE_ENDED,
                                                  .burst = NRF_SAADC_BURST_ENABLED,
                                                  .pin_p = batteryVoltageAdcInput,
@@ -60,22 +63,27 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
     APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
 
     // A hardware voltage divider divides the battery voltage by 2
-    // ADC gain is 1/5
-    // thus adc_voltage = battery_voltage / 2 * gain = battery_voltage / 10
-    // reference_voltage is 0.6V
+    // ADC gain is 1/4
+    // thus adc_voltage = battery_voltage / 2 * gain = battery_voltage / 8
+    // reference_voltage is 600mV
     // p_event->data.done.p_buffer[0] = (adc_voltage / reference_voltage) * 1024
-    voltage = p_event->data.done.p_buffer[0] * 6000 / 1024;
-    percentRemaining = (voltage - battery_min) * 100 / (battery_max - battery_min);
-    percentRemaining = std::max(percentRemaining, 0);
-    percentRemaining = std::min(percentRemaining, 100);
-    percentRemainingBuffer.Insert(percentRemaining);
-
-    samples++;
-    if (samples > percentRemainingSamples) {
-      nrfx_saadc_uninit();
-      isReading = false;
+    voltage = p_event->data.done.p_buffer[0] * (8 * 600) / 1024;
+
+    if (isFull) {
+      percentRemaining = 100;
+    } else if (voltage < battery_min) {
+      percentRemaining = 0;
     } else {
-      nrfx_saadc_sample();
+      percentRemaining = std::min((voltage - battery_min) * 100 / (battery_max - battery_min), isCharging ? 99 : 100);
     }
+
+    nrfx_saadc_uninit();
+    isReading = false;
+
+    systemTask->PushMessage(System::Messages::BatteryMeasurementDone);
   }
 }
+
+void Battery::Register(Pinetime::System::SystemTask* systemTask) {
+  this->systemTask = systemTask;
+}