Merge branch 'develop' of JF/PineTime into master

2 files changed, 9 insertions, 1 deletions

diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index 7f53fbf..345234b 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -7,6 +7,8 @@ APP_TIMER_DEF(vibTimer);
 
 using namespace Pinetime::Controllers;
 
+MotorController::MotorController( Controllers::Settings &settingsController ) : settingsController{settingsController} {}
+
 void MotorController::Init() {
     nrf_gpio_cfg_output(pinMotor);
     nrf_gpio_pin_set(pinMotor);
@@ -14,7 +16,10 @@ void MotorController::Init() {
     app_timer_create(&vibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
 }
 
-void MotorController::SetDuration(uint8_t motorDuration) {    
+void MotorController::SetDuration(uint8_t motorDuration) {
+
+    if ( settingsController.GetVibrationStatus() == Controllers::Settings::Vibration::OFF ) return;
+    
     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);
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);
     };
   }