Merge branch 'alarm-reliability-and-switch-to-freertos-timers' into rev22-develop

1 files changed, 10 insertions, 8 deletions

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