diff options
author | Riku Isokoski <riksu9000@gmail.com> | 2021-08-01 11:47:26 +0300 |
---|---|---|
committer | Riku Isokoski <riksu9000@gmail.com> | 2021-08-01 11:47:26 +0300 |
commit | 5bdef365f2b8f8e0ba06d04216749205a5bba50d (patch) | |
tree | b0260cd863c37ca1cee57fd813647706e2d07f77 /src/displayapp/screens/Clock.h | |
parent | 9e8dd9a1e63523f4e3ed322978e5b5e079c50375 (diff) | |
parent | 514481ef7f9c71ad816b31d979c6ab39ce9380dd (diff) |
Merge branch 'develop' into HEAD
Diffstat (limited to 'src/displayapp/screens/Clock.h')
-rw-r--r-- | src/displayapp/screens/Clock.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h index 9879985f..a48feea1 100644 --- a/src/displayapp/screens/Clock.h +++ b/src/displayapp/screens/Clock.h @@ -4,8 +4,8 @@ #include <chrono> #include <cstdint> #include <memory> +#include <components/heartrate/HeartRateController.h> #include "Screen.h" -#include "ScreenList.h" #include "components/datetime/DateTimeController.h" namespace Pinetime { @@ -47,9 +47,10 @@ namespace Pinetime { Controllers::HeartRateController& heartRateController; Controllers::MotionController& motionController; - ScreenList<2> screens; + std::unique_ptr<Screen> screen; std::unique_ptr<Screen> WatchFaceDigitalScreen(); std::unique_ptr<Screen> WatchFaceAnalogScreen(); + std::unique_ptr<Screen> PineTimeStyleScreen(); // Examples for more watch faces // std::unique_ptr<Screen> WatchFaceMinimalScreen(); |