Fix wake up lock in twi

optimize battery code

src/components/battery/BatteryController.cpp

@@ -7,11 +7,11 @@
 
 using namespace Pinetime::Controllers;
 
-#define SAMPLES_IN_BUFFER 1
+Battery *Battery::instance = nullptr;
-static nrf_saadc_value_t m_buffer_pool[2][SAMPLES_IN_BUFFER];
 
-static float voltage = 0.0f;
+Battery::Battery() {
-static int percentRemaining = -1;
+  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(&saadc_value, 1));
-  APP_ERROR_CHECK(nrfx_saadc_buffer_convert(m_buffer_pool[1],SAMPLES_IN_BUFFER));
 
 }
 
 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_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 )
+    const float battery_min = 3.20; // minimum voltage of battery before shutdown ( depends on the battery )
 
-  if (p_event->type == NRFX_SAADC_EVT_DONE) {
+    if (p_event->type == NRFX_SAADC_EVT_DONE) {
       
-    APP_ERROR_CHECK(nrfx_saadc_buffer_convert(p_event->data.done.p_buffer, SAMPLES_IN_BUFFER));
+      APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
 
-    for (i = 0; i < SAMPLES_IN_BUFFER; i++) {
+      voltage = (static_cast<float>(p_event->data.done.p_buffer[0]) * 2.04f) / (1024 / 3.0f);
-      avg_sample += p_event->data.done.p_buffer[i]; // take N samples in a row
+      voltage = roundf(voltage * 100) / 100;
+
+      percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
+
+      percentRemaining = std::max(percentRemaining, 0);
+      percentRemaining = std::min(percentRemaining, 100);
+
+      nrfx_saadc_uninit();
     }
-    avg_sample /= i; // average all the samples out
-
-    voltage = (static_cast<float>(avg_sample) * 2.04f) / (1024 / 3.0f);
-    voltage = roundf(voltage * 100) / 100;
-
-    percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
-
-    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;

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);
     };
   }
 }

src/drivers/TwiMaster.cpp

@@ -62,11 +62,9 @@ void TwiMaster::Init() {
 }
 
 TwiMaster::ErrorCodes TwiMaster::Read(uint8_t deviceAddress, uint8_t registerAddress, uint8_t *data, size_t size) {
-  // this is causing an error when came from sleep
+  xSemaphoreTake(mutex, portMAX_DELAY);  
-  // 
-  //xSemaphoreTake(mutex, portMAX_DELAY);  
   auto ret = ReadWithRetry(deviceAddress, registerAddress, data, size);
-  //xSemaphoreGive(mutex);
+  xSemaphoreGive(mutex);
 
   return ret;
 }

src/systemtask/SystemTask.cpp

@@ -167,6 +167,21 @@ void SystemTask::Work() {
           isSleeping = false;
           isWakingUp = false;
           break;
+        case Messages::TouchWakeUp: {
+          auto touchInfo = touchPanel.GetTouchInfo();
+          if( touchInfo.isTouch and 
+              (
+                ( touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and 
+                  settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::DoubleTap 
+                ) or
+                ( touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and 
+                  settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::SingleTap
+                )
+              )
+            ) {
+            GoToRunning();
+          }
+        } break;
         case Messages::GoToSleep:
           isGoingToSleep = true;
           NRF_LOG_INFO("[systemtask] Going to sleep");
@@ -276,16 +291,7 @@ void SystemTask::OnTouchEvent() {
   } else if(!isWakingUp) {
     if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::None or 
           settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist ) return;
-
+    PushMessage(Messages::TouchWakeUp);
-    if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::SingleTap ) {
-      GoToRunning();
-    } else if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::DoubleTap ) {
-      
-      auto info = touchPanel.GetTouchInfo();
-      if( info.isTouch and info.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap ) {
-        GoToRunning();
-      }
-    }
   }
 }
 

src/systemtask/SystemTask.h

@@ -37,7 +37,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask {
       public:
-        enum class Messages {GoToSleep, GoToRunning, OnNewTime, OnNewNotification, OnNewCall, BleConnected, UpdateTimeOut,
+        enum class Messages {GoToSleep, GoToRunning, TouchWakeUp, OnNewTime, OnNewNotification, OnNewCall, BleConnected, UpdateTimeOut,
             BleFirmwareUpdateStarted, BleFirmwareUpdateFinished, OnTouchEvent, OnButtonEvent, OnDisplayTaskSleeping, EnableSleeping, DisableSleeping
         };