Merge branch 'develop' into recovery-firmware

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h

2 files changed, 44 insertions, 0 deletions

diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
new file mode 100644
index 00000000..7f53fbf7
--- /dev/null
+++ b/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);
+}
\ No newline at end of file
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
new file mode 100644
index 00000000..bdc20c0c
--- /dev/null
+++ b/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);
+    };
+  }
+}