Merge pull request #217 from joaquimorg/MultiFaceClock

Multi face support, analog clock, 12/24 config

1 files changed, 7 insertions, 1 deletions

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index c38404ba..8ee05fd6 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -9,8 +9,10 @@
 #include "TouchEvents.h"
 #include "components/brightness/BrightnessController.h"
 #include "components/firmwarevalidator/FirmwareValidator.h"
+#include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 
+
 namespace Pinetime {
 
   namespace Drivers {
@@ -19,6 +21,7 @@ namespace Pinetime {
     class WatchdogView;
   }
   namespace Controllers {
+    class Settings;
     class Battery;
     class Ble;
     class DateTime;
@@ -44,7 +47,9 @@ namespace Pinetime {
                    Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
                    System::SystemTask &systemTask,
                    Pinetime::Controllers::NotificationManager& notificationManager,
-                   Pinetime::Controllers::HeartRateController& heartRateController);
+                   Pinetime::Controllers::HeartRateController& heartRateController,
+                   Controllers::Settings &settingsController
+                   );
         void Start();
         void PushMessage(Messages msg);
 
@@ -89,6 +94,7 @@ namespace Pinetime {
         Pinetime::Controllers::FirmwareValidator validator;
         TouchModes touchMode = TouchModes::Gestures;
         Pinetime::Controllers::HeartRateController& heartRateController;
+        Pinetime::Controllers::Settings& settingsController;
     };
   }
 }