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

Merge remote-tracking branch 'upstream/develop' into pts-settings

Browse Source
This commit is contained in:
Kieran Cawthray
2021-12-05 20:32:29 +01:00
parent 1b2a8a5a04 85a25302bf
commit c00ad4af35
191 changed files with 587 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/displayapp/screens/Clock.cpp
View File

@@ -1,4 +1,4 @@
#include "Clock.h"
#include "displayapp/screens/Clock.h"
#include <date/date.h>
#include <lvgl/lvgl.h>
@@ -6,10 +6,11 @@
#include "components/motion/MotionController.h"
#include "components/ble/BleController.h"
#include "components/ble/NotificationManager.h"
#include "../DisplayApp.h"
#include "WatchFaceDigital.h"
#include "WatchFaceAnalog.h"
#include "PineTimeStyle.h"
#include "components/settings/Settings.h"
#include "displayapp/DisplayApp.h"
#include "displayapp/screens/WatchFaceDigital.h"
#include "displayapp/screens/WatchFaceAnalog.h"
#include "displayapp/screens/PineTimeStyle.h"
using namespace Pinetime::Applications::Screens;