Fix merge conflict.

src/components/ble/NotificationManager.cpp

@@ -71,6 +71,14 @@ bool NotificationManager::AreNewNotificationsAvailable() {
   return newNotification;
 }
 
+bool NotificationManager::IsVibrationEnabled() {
+  return vibrationEnabled;
+}
+
+void NotificationManager::ToggleVibrations() {
+  vibrationEnabled = !vibrationEnabled;  
+}
+
 bool NotificationManager::ClearNewNotificationFlag() {
   return newNotification.exchange(false);
 }

src/components/ble/NotificationManager.h

@@ -28,6 +28,8 @@ namespace Pinetime {
       Notification GetPrevious(Notification::Id id);
       bool ClearNewNotificationFlag();
       bool AreNewNotificationsAvailable();
+      bool IsVibrationEnabled();
+      void ToggleVibrations();
 
       static constexpr size_t MaximumMessageSize() { return MessageSize; };
       size_t NbNotifications() const;
@@ -40,6 +42,7 @@ namespace Pinetime {
         uint8_t writeIndex = 0;
         bool empty = true;
         std::atomic<bool> newNotification{false};
+        bool vibrationEnabled = true;
     };
   }
 }

src/components/motor/MotorController.cpp

@@ -0,0 +1,25 @@
+#include "MotorController.h"
+#include <hal/nrf_gpio.h>
+#include "systemtask/SystemTask.h"
+#include "app_timer.h"
+
+APP_TIMER_DEF(vibTimer);
+
+using namespace Pinetime::Controllers;
+
+void MotorController::Init() {
+    nrf_gpio_cfg_output(pinMotor);
+    nrf_gpio_pin_set(pinMotor);
+    app_timer_init();
+    app_timer_create(&vibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
+}
+
+void MotorController::SetDuration(uint8_t motorDuration) {    
+    nrf_gpio_pin_clear(pinMotor);
+    /* Start timer for motorDuration miliseconds and timer triggers vibrate() when it finishes*/
+    app_timer_start(vibTimer, APP_TIMER_TICKS(motorDuration), NULL);
+}
+
+void MotorController::vibrate(void * p_context) {
+    nrf_gpio_pin_set(pinMotor);
+}

src/components/motor/MotorController.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <cstdint>
+#include "app_timer.h"
+
+namespace Pinetime {
+  namespace Controllers {
+    static constexpr uint8_t pinMotor = 16;
+
+    class MotorController {
+      public:
+        void Init();
+        void SetDuration(uint8_t motorDuration);
+
+      private:
+        static void vibrate(void * p_context);
+    };
+  }
+}