diff options
| author | JF <jf@codingfield.com> | 2021-05-21 09:58:49 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-05-21 09:58:49 (GMT) |
| commit | fb133a0167f7ea4281bca45be6efc928720d4f82 (patch) | |
| tree | f7d079555114dcd66a4f49648ff48c425725d0d3 /src | |
| parent | de69905c0647997091d9e385538c96de30be93e6 (diff) | |
| parent | f88c0f41fac506cc55e026cc67d1d5bce4669d31 (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.cpp | 5 | ||||
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp index a132a47..856eafd 100644 --- 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 index 30b8e0a..2c5a36f 100644 --- 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); |