create motorcontroller in main and pass by reference

2 files changed, 12 insertions, 5 deletions

diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index cfcecec..b777aca 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -3,12 +3,16 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Notifications::Notifications(DisplayApp *app, Pinetime::Controllers::NotificationManager &notificationManager, Modes mode) :
-        Screen(app), notificationManager{notificationManager}, mode{mode} {
+Notifications::Notifications(DisplayApp *app, 
+  Pinetime::Controllers::NotificationManager &notificationManager, 
+  Pinetime::Controllers::MotorController& motorController, 
+  Modes mode) :
+    Screen(app), notificationManager{notificationManager}, 
+    motorController{motorController}, mode{mode} {
+
   notificationManager.ClearNewNotificationFlag();
   auto notification = notificationManager.GetLastNotification();
   
-  motorController.Init(); //start the vibration timer setups
 
   if(notification.valid) {
     currentId = notification.id;
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 345ad15..85d1354 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -13,7 +13,10 @@ namespace Pinetime {
       class Notifications : public Screen {
         public:
           enum class Modes {Normal, Preview};
-          explicit Notifications(DisplayApp* app, Pinetime::Controllers::NotificationManager& notificationManager, Modes mode);
+          explicit Notifications(DisplayApp* app, 
+                  Pinetime::Controllers::NotificationManager& notificationManager, 
+                  Pinetime::Controllers::MotorController& motorController,
+                  Modes mode);
           ~Notifications() override;
 
           bool Refresh() override;
@@ -46,7 +49,7 @@ namespace Pinetime {
             const char* text;
           };
           Pinetime::Controllers::NotificationManager& notificationManager;
-          Pinetime::Controllers::MotorController motorController;
+          Pinetime::Controllers::MotorController& motorController;
           Modes mode = Modes::Normal;
           std::unique_ptr<NotificationItem> currentItem;
           Controllers::NotificationManager::Notification::Id currentId;