From 7ab153cd7690db8a43bde1af792edecc5e0f8d5d Mon Sep 17 00:00:00 2001
From: petter <39340152+petterhs@users.noreply.github.com>
Date: Fri, 5 Feb 2021 17:06:56 +0100
Subject: [PATCH] refactor MotorController

---
 src/components/motor/MotorController.cpp | 33 +++++++-----------------
 src/components/motor/MotorController.h   |  1 +
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index 51a01b4c..7f53fbf7 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -2,39 +2,24 @@
 #include <hal/nrf_gpio.h>
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"
-#include "nrf_drv_clock.h"
 
 APP_TIMER_DEF(vibTimer);
 
 using namespace Pinetime::Controllers;
 
-static void lfclk_request(void)     //get the low freq. clock
-{
-    nrf_drv_clock_init();
-    nrf_drv_clock_lfclk_request(NULL);
-}
-
-void vibrateTimer(void * p_context)
-{
-    nrf_gpio_pin_set(pinMotor);
-}
-
-static void create_timers()
-{
-    //create timer, single shot, re-armable
-    app_timer_create(&vibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrateTimer);
-}
-
 void MotorController::Init() {
-    nrf_gpio_cfg_output(pinMotor); // set the motor pin as an output 
+    nrf_gpio_cfg_output(pinMotor);
     nrf_gpio_pin_set(pinMotor);
-    lfclk_request();        //get lfclock ready
-    app_timer_init();       //start app timers to make calls
-    create_timers();
+    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
-    app_timer_start(vibTimer, APP_TIMER_TICKS(motorDuration), NULL); //timers trigger at end of duration?
+    /* 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
index 9ce91c52..bdc20c0c 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -13,6 +13,7 @@ namespace Pinetime {
         void SetDuration(uint8_t motorDuration);
 
       private:
+        static void vibrate(void * p_context);
     };
   }
 }