Merge branch 'develop' of JF/PineTime into master

1 files changed, 6 insertions, 1 deletions

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 9a3d119..c22aa1f 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -9,6 +9,7 @@
 #include "TouchEvents.h"
 #include "components/brightness/BrightnessController.h"
 #include "components/firmwarevalidator/FirmwareValidator.h"
+#include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 #include "Messages.h"
 
@@ -20,6 +21,7 @@ namespace Pinetime {
     class WatchdogView;
   }
   namespace Controllers {
+    class Settings;
     class Battery;
     class Ble;
     class DateTime;
@@ -42,7 +44,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(Display::Messages msg);
 
@@ -87,6 +91,7 @@ namespace Pinetime {
         Pinetime::Controllers::FirmwareValidator validator;
         TouchModes touchMode = TouchModes::Gestures;
         Pinetime::Controllers::HeartRateController& heartRateController;
+        Pinetime::Controllers::Settings& settingsController;
     };
   }
 }