diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-20 10:41:49 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-20 10:41:49 (GMT) |
| commit | 405c85c160b0d72407498a25555677d484b822f1 (patch) | |
| tree | 71b22af329f7b5ee7a6f37ddca4c738f0e379593 /src/displayapp/DisplayAppRecovery.h | |
| parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
| parent | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (diff) | |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
# Conflicts:
# src/main.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/DisplayAppRecovery.h')
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h index bcabea3..a3f27d2 100644 --- a/src/displayapp/DisplayAppRecovery.h +++ b/src/displayapp/DisplayAppRecovery.h @@ -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); |