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

Merge branch 'develop' of github.com:JF002/Pinetime into develop

Browse Source 
# Conflicts:
#	src/main.cpp
#	src/systemtask/SystemTask.h
This commit is contained in:
Jean-François Milants
2021-03-20 11:41:49 +01:00
parent e63596b291 9e9bb2085e
commit 405c85c160
27 changed files with 1326 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/displayapp/DisplayAppRecovery.h
View File

@@ -14,8 +14,9 @@
#include "components/firmwarevalidator/FirmwareValidator.h"
#include "drivers/Cst816s.h"
#include <date/date.h>
#include "displayapp/screens/Clock.h"
#include <drivers/Watchdog.h>
#include <components/heartrate/HeartRateController.h>
#include <components/settings/Settings.h>
#include "TouchEvents.h"
#include "Apps.h"
#include "Messages.h"
@@ -33,7 +34,8 @@ namespace Pinetime {
Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
System::SystemTask &systemTask,
Pinetime::Controllers::NotificationManager& notificationManager,
Pinetime::Controllers::HeartRateController& heartRateController);
Pinetime::Controllers::HeartRateController& heartRateController,
Pinetime::Controllers::Settings& settingsController);
void Start();
void PushMessage(Pinetime::Applications::Display::Messages msg);