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

# Conflicts:
#	src/components/alarm/AlarmController.cpp
#	src/components/datetime/DateTimeController.cpp
#	src/components/motor/MotorController.cpp
#	src/components/timer/TimerController.cpp
#	src/components/timer/TimerController.h
#	src/systemtask/Messages.h
#	src/systemtask/SystemTask.cpp

2 files changed, 3 insertions, 1 deletions

diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
index 9802ded..9456909 100644
--- a/src/components/timer/TimerController.cpp
+++ b/src/components/timer/TimerController.cpp
@@ -21,7 +21,7 @@ void TimerController::Init(System::SystemTask* systemTask) {
 }
 
 void TimerController::StartTimer(uint32_t duration) {
-  xTimerStop(timerAppTimer,0);
+  xTimerStop(timerAppTimer, 0);
   auto currentTicks = xTaskGetTickCount();
   TickType_t durationTicks = APP_TIMER_TICKS(duration);
   xTimerChangePeriod(timerAppTimer, durationTicks, 0);
@@ -60,3 +60,4 @@ void TimerController::OnTimerEnd() {
     systemTask->PushMessage(System::Messages::OnTimerDone);
   }
 }
+
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
index cdd78ec..b1b8d3c 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -28,6 +28,7 @@ namespace Pinetime {
       }
 
       void OnTimerEnd();
+
     protected:
       friend class Pinetime::System::SystemTask;
       void Init(System::SystemTask* systemTask);