Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index bdc20c0..2f2e034 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include "app_timer.h"
+#include "components/settings/Settings.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -9,10 +10,12 @@ namespace Pinetime {
 
     class MotorController {
       public:
+        MotorController( Controllers::Settings &settingsController );
         void Init();
         void SetDuration(uint8_t motorDuration);
 
       private:
+        Controllers::Settings& settingsController;
         static void vibrate(void * p_context);
     };
   }