Fix wake up lock in twi

optimize battery code

1 files changed, 10 insertions, 2 deletions

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