Replace app_timer with FreeRTOS timers

src/components/timer/TimerController.cpp

@@ -1,69 +1,39 @@
-//
-// Created by florian on 16.05.21.
-//
-
 #include "components/timer/TimerController.h"
 #include "systemtask/SystemTask.h"
-#include "app_timer.h"
-#include "task.h"
 
 using namespace Pinetime::Controllers;
 
-
+void TimerCallback(TimerHandle_t xTimer) {
-APP_TIMER_DEF(timerAppTimer);
+  auto* controller = static_cast<TimerController*>(pvTimerGetTimerID(xTimer));
-
-namespace {
-  void TimerEnd(void* p_context) {
-    auto* controller = static_cast<Pinetime::Controllers::TimerController*> (p_context);
-    if(controller != nullptr)
   controller->OnTimerEnd();
-  }
 }
 
-
+void TimerController::Init(Pinetime::System::SystemTask* systemTask) {
-void TimerController::Init() {
+  this->systemTask = systemTask;
-  app_timer_create(&timerAppTimer, APP_TIMER_MODE_SINGLE_SHOT, TimerEnd);
+  timer = xTimerCreate("Timer", 0, pdFALSE, this, TimerCallback);
 }
 
 void TimerController::StartTimer(uint32_t duration) {
-  app_timer_stop(timerAppTimer);
+  xTimerChangePeriod(timer, pdMS_TO_TICKS(duration), 0);
-  auto currentTicks = xTaskGetTickCount();
+  xTimerStart(timer, 0);
-  app_timer_start(timerAppTimer, APP_TIMER_TICKS(duration), this);
-  endTicks = currentTicks + APP_TIMER_TICKS(duration);
-  timerRunning = true;
 }
 
 uint32_t TimerController::GetTimeRemaining() {
-  if (!timerRunning) {
+  if (IsRunning()) {
+    TickType_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
+    return (remainingTime * 1000 / configTICK_RATE_HZ);
+  }
   return 0;
-  }
-  auto currentTicks = xTaskGetTickCount();
-  
-  TickType_t deltaTicks = 0;
-  if (currentTicks > endTicks) {
-    deltaTicks = 0xffffffff - currentTicks;
-    deltaTicks += (endTicks + 1);
-  } 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(timer, 0);
-  timerRunning = false;
 }
 
 bool TimerController::IsRunning() {
-  return timerRunning;
+  return (xTimerIsTimerActive(timer) == pdTRUE);
-}
-void TimerController::OnTimerEnd() {
-  timerRunning = false;
-  if(systemTask != nullptr)
-    systemTask->PushMessage(System::Messages::OnTimerDone);
 }
 
-void TimerController::Register(Pinetime::System::SystemTask* systemTask) {
+void TimerController::OnTimerEnd() {
-  this->systemTask = systemTask;
+  systemTask->PushMessage(System::Messages::OnTimerDone);
 }

src/components/timer/TimerController.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <cstdint>
+#include <FreeRTOS.h>
-#include "app_timer.h"
+#include <timers.h>
-#include "portmacro_cmsis.h"
 
 namespace Pinetime {
   namespace System {
@@ -14,7 +13,7 @@ namespace Pinetime {
     public:
       TimerController() = default;
 
-      void Init();
+      void Init(System::SystemTask* systemTask);
 
       void StartTimer(uint32_t duration);
 
@@ -26,12 +25,9 @@ namespace Pinetime {
 
       void OnTimerEnd();
 
-      void Register(System::SystemTask* systemTask);
-
     private:
       System::SystemTask* systemTask = nullptr;
-      TickType_t endTicks;
+      TimerHandle_t timer;
-      bool timerRunning = false;
     };
   }
 }

src/systemtask/SystemTask.cpp

@@ -2,7 +2,7 @@
 #include <hal/nrf_rtc.h>
 #include <libraries/gpiote/app_gpiote.h>
 #include <libraries/log/nrf_log.h>
-
+#include <app_timer.h>
 #include "BootloaderVersion.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
@@ -152,8 +152,7 @@ void SystemTask::Work() {
   batteryController.Register(this);
   motorController.Init();
   motionSensor.SoftReset();
-  timerController.Register(this);
+  timerController.Init(this);
-  timerController.Init();
   alarmController.Init(this);
 
   // Reset the TWI device because the motion sensor chip most probably crashed it...