Switch MotorController and TimerController to FreeRTOS timers

5 files changed, 44 insertions, 45 deletions

diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index c794a02..4c44fc4 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -12,32 +12,33 @@ using namespace Pinetime::Controllers;
 void MotorController::Init() {
   nrf_gpio_cfg_output(PinMap::Motor);
   nrf_gpio_pin_set(PinMap::Motor);
-  app_timer_init();
 
-  app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, StopMotor);
-  app_timer_create(&longVibTimer, APP_TIMER_MODE_REPEATED, Ring);
+  shortVibTimer = xTimerCreate("shortVibTm", 1, pdFALSE, nullptr, StopMotor);
+  longVibTimer = xTimerCreate("longVibTm", 1, pdTRUE, this, Ring);
 }
 
-void MotorController::Ring(void* p_context) {
-  auto* motorController = static_cast<MotorController*>(p_context);
+void MotorController::Ring(TimerHandle_t xTimer) {
+  auto motorController = static_cast<MotorController*>(pvTimerGetTimerID(xTimer));
+  xTimerChangePeriod(motorController->longVibTimer, APP_TIMER_TICKS(1000), 0);
   motorController->RunForDuration(50);
 }
 
 void MotorController::RunForDuration(uint8_t motorDuration) {
-  nrf_gpio_pin_clear(PinMap::Motor);
-  app_timer_start(shortVibTimer, APP_TIMER_TICKS(motorDuration), nullptr);
+  if (xTimerChangePeriod(shortVibTimer, APP_TIMER_TICKS(motorDuration), 0) == pdPASS && xTimerStart(shortVibTimer, 0) == pdPASS) {
+    nrf_gpio_pin_clear(PinMap::Motor);
+  }
 }
 
 void MotorController::StartRinging() {
-  Ring(this);
-  app_timer_start(longVibTimer, APP_TIMER_TICKS(1000), this);
+  xTimerChangePeriod(longVibTimer, 1, 0);
+  xTimerStart(longVibTimer, 0);
 }
 
 void MotorController::StopRinging() {
-  app_timer_stop(longVibTimer);
+  xTimerStop(longVibTimer, 0);
   nrf_gpio_pin_set(PinMap::Motor);
 }
 
-void MotorController::StopMotor(void* p_context) {
+void MotorController::StopMotor(TimerHandle_t xTimer) {
   nrf_gpio_pin_set(PinMap::Motor);
 }
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index b5a592b..3c6cbd2 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <FreeRTOS.h>
+#include <timers.h>
 #include <cstdint>
 
 namespace Pinetime {
@@ -15,8 +17,10 @@ namespace Pinetime {
       void StopRinging();
 
     private:
-      static void Ring(void* p_context);
-      static void StopMotor(void* p_context);
+      static void Ring(TimerHandle_t xTimer);
+      static void StopMotor(TimerHandle_t xTimer);
+      TimerHandle_t shortVibTimer;
+      TimerHandle_t longVibTimer;
     };
   }
 }
diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
index 79e44d6..31635a5 100644
--- a/src/components/timer/TimerController.cpp
+++ b/src/components/timer/TimerController.cpp
@@ -4,32 +4,29 @@
 
 #include "components/timer/TimerController.h"
 #include "systemtask/SystemTask.h"
-#include "app_timer.h"
 #include "task.h"
 
 using namespace Pinetime::Controllers;
 
-
-APP_TIMER_DEF(timerAppTimer);
-
 namespace {
-  void TimerEnd(void* p_context) {
-    auto* controller = static_cast<Pinetime::Controllers::TimerController*> (p_context);
-    if(controller != nullptr)
-      controller->OnTimerEnd();
+  void TimerEnd(TimerHandle_t xTimer) {
+    auto controller = static_cast<Pinetime::Controllers::TimerController*>(pvTimerGetTimerID(xTimer));
+    controller->OnTimerEnd();
   }
 }
 
-
-void TimerController::Init() {
-  app_timer_create(&timerAppTimer, APP_TIMER_MODE_SINGLE_SHOT, TimerEnd);
+void TimerController::Init(System::SystemTask* systemTask) {
+  this->systemTask = systemTask;
+  timerAppTimer = xTimerCreate("timerAppTm", 1, pdFALSE, this, TimerEnd);
 }
 
 void TimerController::StartTimer(uint32_t duration) {
-  app_timer_stop(timerAppTimer);
+  xTimerStop(timerAppTimer, 0);
   auto currentTicks = xTaskGetTickCount();
-  app_timer_start(timerAppTimer, APP_TIMER_TICKS(duration), this);
-  endTicks = currentTicks + APP_TIMER_TICKS(duration);
+  TickType_t durationTicks = APP_TIMER_TICKS(duration);
+  xTimerChangePeriod(timerAppTimer, durationTicks, 0);
+  xTimerStart(timerAppTimer, 0);
+  endTicks = currentTicks + durationTicks;
   timerRunning = true;
 }
 
@@ -38,7 +35,7 @@ uint32_t TimerController::GetTimeRemaining() {
     return 0;
   }
   auto currentTicks = xTaskGetTickCount();
-  
+
   TickType_t deltaTicks = 0;
   if (currentTicks > endTicks) {
     deltaTicks = 0xffffffff - currentTicks;
@@ -46,12 +43,12 @@ uint32_t TimerController::GetTimeRemaining() {
   } else {
     deltaTicks = endTicks - currentTicks;
   }
-  
+
   return (static_cast<TickType_t>(deltaTicks) / static_cast<TickType_t>(configTICK_RATE_HZ)) * 1000;
 }
 
 void TimerController::StopTimer() {
-  app_timer_stop(timerAppTimer);
+  xTimerStop(timerAppTimer, 0);
   timerRunning = false;
 }
 
@@ -60,10 +57,6 @@ bool TimerController::IsRunning() {
 }
 void TimerController::OnTimerEnd() {
   timerRunning = false;
-  if(systemTask != nullptr)
+  if (systemTask != nullptr)
     systemTask->PushMessage(System::Messages::OnTimerDone);
 }
-
-void TimerController::Register(Pinetime::System::SystemTask* systemTask) {
-  this->systemTask = systemTask;
-}
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
index fa7bc90..24d7150 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <FreeRTOS.h>
+#include <timers.h>
 #include <cstdint>
 #include "app_timer.h"
 #include "portmacro_cmsis.h"
@@ -9,27 +11,27 @@ namespace Pinetime {
     class SystemTask;
   }
   namespace Controllers {
-    
+
     class TimerController {
     public:
       TimerController() = default;
-      
-      void Init();
-      
+
       void StartTimer(uint32_t duration);
-      
       void StopTimer();
-      
+
       uint32_t GetTimeRemaining();
-      
+
       bool IsRunning();
 
       void OnTimerEnd();
 
-      void Register(System::SystemTask* systemTask);
+    protected:
+      friend class Pinetime::System::SystemTask;
+      void Init(System::SystemTask* systemTask);
 
     private:
       System::SystemTask* systemTask = nullptr;
+      TimerHandle_t timerAppTimer;
       TickType_t endTicks;
       bool timerRunning = false;
     };
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 9105d89..35406bf 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -152,8 +152,7 @@ void SystemTask::Work() {
   batteryController.Register(this);
   motorController.Init();
   motionSensor.SoftReset();
-  timerController.Register(this);
-  timerController.Init();
+  timerController.Init(this);
   alarmController.Init(this);
 
   // Reset the TWI device because the motion sensor chip most probably crashed it...