2 files changed, 31 insertions, 29 deletions

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 50f95c99..beca95c4 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -7,11 +7,11 @@
 
 using namespace Pinetime::Controllers;
 
-#define SAMPLES_IN_BUFFER 1
-static nrf_saadc_value_t m_buffer_pool[2][SAMPLES_IN_BUFFER];
+Battery *Battery::instance = nullptr;
 
-static float voltage = 0.0f;
-static int percentRemaining = -1;
+Battery::Battery() {
+  instance = this;
+}
 
 void Battery::Init() {
   nrf_gpio_cfg_input(chargingPin, (nrf_gpio_pin_pull_t)GPIO_PIN_CNF_PULL_Pullup);
@@ -31,7 +31,7 @@ void Battery::Update() {
 
 void Battery::SaadcInit() {
   nrfx_saadc_config_t adcConfig = NRFX_SAADC_DEFAULT_CONFIG;
-  APP_ERROR_CHECK(nrfx_saadc_init(&adcConfig, SaadcEventHandler));
+  APP_ERROR_CHECK(nrfx_saadc_init(&adcConfig, adcCallbackStatic));
 
   nrf_saadc_channel_config_t adcChannelConfig = {
           .resistor_p = NRF_SAADC_RESISTOR_DISABLED,
@@ -45,40 +45,34 @@ void Battery::SaadcInit() {
           .pin_n      = NRF_SAADC_INPUT_DISABLED
   };
   APP_ERROR_CHECK(nrfx_saadc_channel_init(0, &adcChannelConfig));
-  APP_ERROR_CHECK(nrfx_saadc_buffer_convert(m_buffer_pool[0],SAMPLES_IN_BUFFER));
-  APP_ERROR_CHECK(nrfx_saadc_buffer_convert(m_buffer_pool[1],SAMPLES_IN_BUFFER));
+  APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
 
 }
 
 void Battery::SaadcEventHandler(nrfx_saadc_evt_t const * p_event) {
-  int avg_sample = 0;
-  int i = 0;
-
-  const float battery_max = 4.18; //maximum voltage of battery ( max charging voltage is 4.21 )
-  const float battery_min = 3.20;  //minimum voltage of battery before shutdown ( depends on the battery )
 
-  if (p_event->type == NRFX_SAADC_EVT_DONE) {
-    
-    APP_ERROR_CHECK(nrfx_saadc_buffer_convert(p_event->data.done.p_buffer, SAMPLES_IN_BUFFER));
-
-    for (i = 0; i < SAMPLES_IN_BUFFER; i++) {
-      avg_sample += p_event->data.done.p_buffer[i]; // take N samples in a row
-    }
-    avg_sample /= i; // average all the samples out
+    const float battery_max = 4.18; // maximum voltage of battery ( max charging voltage is 4.21 )
+    const float battery_min = 3.20; // minimum voltage of battery before shutdown ( depends on the battery )
 
-    voltage = (static_cast<float>(avg_sample) * 2.04f) / (1024 / 3.0f);
-    voltage = roundf(voltage * 100) / 100;
+    if (p_event->type == NRFX_SAADC_EVT_DONE) {
+      
+      APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
 
-    percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
+      voltage = (static_cast<float>(p_event->data.done.p_buffer[0]) * 2.04f) / (1024 / 3.0f);
+      voltage = roundf(voltage * 100) / 100;
 
-    percentRemaining = std::max(percentRemaining, 0);
-    percentRemaining = std::min(percentRemaining, 100);
+      percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
 
-    nrfx_saadc_uninit();
+      percentRemaining = std::max(percentRemaining, 0);
+      percentRemaining = std::min(percentRemaining, 100);
 
+      nrfx_saadc_uninit();
+    }
   }
-}
 
+void Battery::adcCallbackStatic(nrfx_saadc_evt_t const *event) {
+    instance->SaadcEventHandler(event);
+}
 
 int Battery::PercentRemaining() {
   return percentRemaining;
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 9bc942c9..6a0c7dff 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -10,6 +10,8 @@ namespace Pinetime {
     class Battery {
       public:
 
+        Battery();
+
         void Init();
         void Update();
         
@@ -20,16 +22,22 @@ namespace Pinetime {
         bool IsPowerPresent() const { return isPowerPresent; }
 
       private:
+        static Battery *instance;
+        nrf_saadc_value_t  saadc_value;
+
         static constexpr uint32_t chargingPin = 12;
         static constexpr uint32_t powerPresentPin = 19;
         static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
+        float voltage = 0.0f;
+        int percentRemaining = -1;
 
         bool isCharging = false;
         bool isPowerPresent = false;
-
-        static void SaadcEventHandler(nrfx_saadc_evt_t const * p_event);
+        
         void SaadcInit();
 
+        void SaadcEventHandler(nrfx_saadc_evt_t const * p_event);
+        static void adcCallbackStatic(nrfx_saadc_evt_t const *event);
     };
   }
 }
\ No newline at end of file