diff options
| author | hassless <85612141+hassless@users.noreply.github.com> | 2021-06-18 17:17:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 17:17:26 +0200 |
| commit | 84a6c88e98d8b1420edbddd7b67a38737bf5cbb2 (patch) | |
| tree | b10cab7ef1a7645fa897aabb179c2e8849a919d7 /src/displayapp/screens/Clock.h | |
| parent | d0df278b0be2aae0493d901569a094dba221ce99 (diff) | |
| parent | e90e8c7426f9a44e696b208a5b393a60476a3d43 (diff) | |
Merge branch 'JF002:develop' into improve-battery-percentage-to-battery-icon-mapping
Diffstat (limited to 'src/displayapp/screens/Clock.h')
| -rw-r--r-- | src/displayapp/screens/Clock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h index 9879985f..174c73b7 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,7 +47,7 @@ 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(); |