Merge branch 'alarm-fix-work' into edge

# Conflicts:
#	src/components/timer/TimerController.cpp

1 files changed, 6 insertions, 2 deletions

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