summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Clock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
-rw-r--r--src/displayapp/screens/Clock.cpp25
1 files changed, 22 insertions, 3 deletions
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index fd74683..671f359 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -11,7 +11,9 @@
#include "displayapp/screens/WatchFaceDigital.h"
#include "displayapp/screens/WatchFaceTerminal.h"
#include "displayapp/screens/WatchFaceAnalog.h"
+#include "displayapp/screens/WatchFaceAnalog24.h"
#include "displayapp/screens/PineTimeStyle.h"
+#include "systemtask/SystemTask.h"
using namespace Pinetime::Applications::Screens;
@@ -22,8 +24,10 @@ Clock::Clock(DisplayApp* app,
Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
- Controllers::MotionController& motionController)
+ Controllers::MotionController& motionController,
+ System::SystemTask& systemTask)
: Screen(app),
+ systemTask {systemTask},
dateTimeController {dateTimeController},
batteryController {batteryController},
bleController {bleController},
@@ -40,9 +44,12 @@ Clock::Clock(DisplayApp* app,
return WatchFaceAnalogScreen();
break;
case 2:
- return PineTimeStyleScreen();
+ return WatchFaceAnalog24Screen();
break;
case 3:
+ return PineTimeStyleScreen();
+ break;
+ case 4:
return WatchFaceTerminalScreen();
break;
}
@@ -71,7 +78,8 @@ std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
notificatioManager,
settingsController,
heartRateController,
- motionController);
+ motionController,
+ systemTask);
}
std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
@@ -79,6 +87,17 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
}
+std::unique_ptr<Screen> Clock::WatchFaceAnalog24Screen() {
+ return std::make_unique<Screens::WatchFaceAnalog24>(app,
+ dateTimeController,
+ batteryController,
+ bleController,
+ notificatioManager,
+ settingsController,
+ heartRateController,
+ motionController);
+}
+
std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
return std::make_unique<Screens::PineTimeStyle>(
app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, motionController);