Merge branch 'develop' of JF/PineTime into master

InfiniTimeOrg · May 21, 2021 · fb133a0 · fb133a0
2 parents de69905 + f88c0f4
commit fb133a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
@@ -17,9 +17,10 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        System::SystemTask& systemTask,
                        Pinetime::Controllers::NotificationManager& notificationManager,
                        Pinetime::Controllers::HeartRateController& heartRateController,
-                       Pinetime::Controllers::Settings& settingsController,
+                       Controllers::Settings& settingsController,
                        Pinetime::Controllers::MotorController& motorController,
-                       Pinetime::Controllers::MotionController& motionController)
+                       Pinetime::Controllers::MotionController& motionController,
+                       Pinetime::Controllers::TimerController& timerController)
   : lcd {lcd}, bleController {bleController} {
   msgQueue = xQueueCreate(queueSize, itemSize);
 }

diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
@@ -23,6 +23,7 @@
 #include "Apps.h"
 #include "Messages.h"
 #include "DummyLittleVgl.h"
+#include "components/timer/TimerController.h"
 
 namespace Pinetime {
   namespace System {
@@ -41,9 +42,10 @@ namespace Pinetime {
                  System::SystemTask& systemTask,
                  Pinetime::Controllers::NotificationManager& notificationManager,
                  Pinetime::Controllers::HeartRateController& heartRateController,
-                 Pinetime::Controllers::Settings& settingsController,
+                 Controllers::Settings& settingsController,
                  Pinetime::Controllers::MotorController& motorController,
-                 Pinetime::Controllers::MotionController& motionController);
+                 Pinetime::Controllers::MotionController& motionController,
+                 Pinetime::Controllers::TimerController& timerController);
       void Start();
       void PushMessage(Pinetime::Applications::Display::Messages msg);