MotorController: Add ringing for X times

InfiniTimeOrg · Jan 27, 2022 · e53415a · e53415a
1 parent 23ca635
commit e53415a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
@@ -21,6 +21,9 @@ void MotorController::Init() {
 void MotorController::Ring(void* p_context) {
   auto* motorController = static_cast<MotorController*>(p_context);
   motorController->RunForDuration(50);
+  if (motorController->shouldStopRinging()) {
+    motorController->StopRinging();
+  }
 }
 
 void MotorController::RunForDuration(uint8_t motorDuration) {
@@ -29,6 +32,13 @@ void MotorController::RunForDuration(uint8_t motorDuration) {
 }
 
 void MotorController::StartRinging() {
+  timesToRing = -1;
+  Ring(this);
+  app_timer_start(longVibTimer, APP_TIMER_TICKS(1000), this);
+}
+
+void MotorController::StartRingingCoupleTimes(int8_t times) {
+  timesToRing = times;
   Ring(this);
   app_timer_start(longVibTimer, APP_TIMER_TICKS(1000), this);
 }
@@ -41,3 +51,16 @@ void MotorController::StopRinging() {
 void MotorController::StopMotor(void* p_context) {
   nrf_gpio_pin_set(PinMap::Motor);
 }
+
+bool MotorController::shouldStopRinging(){
+  // repeat forever if timesToRing is negative
+  if (timesToRing < 0) {
+    return false;
+  }
+
+  if (timesToRing == 0) {
+    return true;
+  }
+  timesToRing--;
+  return false;
+}
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
@@ -12,11 +12,16 @@ namespace Pinetime {
       void Init();
       void RunForDuration(uint8_t motorDuration);
       void StartRinging();
+      void StartRingingCoupleTimes(int8_t times);
       static void StopRinging();
 
     private:
+      bool shouldStopRinging();
+
       static void Ring(void* p_context);
       static void StopMotor(void* p_context);
+
+      int8_t timesToRing = 0;
     };
   }
 }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
@@ -314,7 +314,7 @@ void SystemTask::Work() {
           if (isSleeping && !isWakingUp) {
             GoToRunning();
           }
-          motorController.StartRinging();
+          motorController.StartRingingCoupleTimes(10);
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
           break;
         case Messages::SetOffAlarm: