CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into pinetimestyle

Browse Source
This commit is contained in:
JF002
2021-06-12 21:01:55 +02:00
committed by GitHub
parent f2d01166c3 e90e8c7426
commit ab1a3900a3
61 changed files with 964 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/displayapp/screens/Clock.h
View File

@@ -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<3> screens;
std::unique_ptr<Screen> screen;
std::unique_ptr<Screen> WatchFaceDigitalScreen();
std::unique_ptr<Screen> WatchFaceAnalogScreen();
std::unique_ptr<Screen> PineTimeStyleScreen();