diff options
| author | JF <JF002@users.noreply.github.com> | 2022-09-27 21:27:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 21:27:36 +0200 |
| commit | 63932810d2707e6c530dae64b209ac240137dc17 (patch) | |
| tree | c6b6b10268726781ce6ee9ef8b64c99680e11ae5 /src/displayapp/screens/Clock.cpp | |
| parent | f699261ca326c76b72a864cb9576cf4c69bd5474 (diff) | |
| parent | 58586d0ad1ebeefd7a6f269089f467ccba2f468c (diff) | |
Merge pull request #1024 from dmlls/infineat-pr
Infineat Watchface + support for external resources.
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
| -rw-r--r-- | src/displayapp/screens/Clock.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index 1687dccf..443506e0 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -10,6 +10,7 @@ #include "displayapp/DisplayApp.h" #include "displayapp/screens/WatchFaceDigital.h" #include "displayapp/screens/WatchFaceTerminal.h" +#include "displayapp/screens/WatchFaceInfineat.h" #include "displayapp/screens/WatchFaceAnalog.h" #include "displayapp/screens/WatchFacePineTimeStyle.h" @@ -22,7 +23,8 @@ Clock::Clock(DisplayApp* app, Controllers::NotificationManager& notificatioManager, Controllers::Settings& settingsController, Controllers::HeartRateController& heartRateController, - Controllers::MotionController& motionController) + Controllers::MotionController& motionController, + Controllers::FS& filesystem) : Screen(app), dateTimeController {dateTimeController}, batteryController {batteryController}, @@ -31,6 +33,7 @@ Clock::Clock(DisplayApp* app, settingsController {settingsController}, heartRateController {heartRateController}, motionController {motionController}, + filesystem {filesystem}, screen {[this, &settingsController]() { switch (settingsController.GetClockFace()) { case 0: @@ -45,6 +48,9 @@ Clock::Clock(DisplayApp* app, case 3: return WatchFaceTerminalScreen(); break; + case 4: + return WatchFaceInfineatScreen(); + break; } return WatchFaceDigitalScreen(); }()} { @@ -103,3 +109,14 @@ std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() { heartRateController, motionController); } + +std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() { + return std::make_unique<Screens::WatchFaceInfineat>(app, + dateTimeController, + batteryController, + bleController, + notificatioManager, + settingsController, + motionController, + filesystem); +} |