Timer: ringing

Author: hatmajster

src/components/timer/TimerController.cpp

@@ -49,6 +49,12 @@ void TimerController::StopTimer() {
   overtime = false;
 }
 
+void TimerController::StopAlerting() {
+  if (systemTask != nullptr) {
+    systemTask->PushMessage(System::Messages::StopRinging);
+  }
+}
+
 void TimerController::OnTimerEnd() {
   overtime = true;
   if (systemTask != nullptr) {

src/components/timer/TimerController.h

@@ -15,17 +15,13 @@ namespace Pinetime {
       TimerController() = default;
 
       void Init();
-
       void StartTimer(uint32_t duration);
-
       void StopTimer();
-
+      void StopAlerting();
       int32_t GetSecondsRemaining();
-
       bool IsOvertime() {
         return overtime;
       }
-
       bool IsRunning() {
         return timerRunning;
       }

src/displayapp/screens/Timer.cpp

@@ -60,6 +60,7 @@ void Timer::stop() {
     secondsToSet = secondsRemaining % 60;
   }
   timerController.StopTimer();
+  timerController.StopAlerting();
   lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
   lv_label_set_text_fmt(time, "%02lu:%02lu", secondsRemaining / 60, secondsRemaining % 60);
   lv_label_set_text(txtPlayPause, Symbols::play);
@@ -106,6 +107,7 @@ Timer::~Timer() {
   lv_obj_clean(lv_scr_act());
   if (timerController.IsRunning() && timerController.IsOvertime()) {
     timerController.StopTimer();
+    timerController.StopAlerting();
   }
 }
 

src/systemtask/SystemTask.cpp

@@ -310,7 +310,7 @@ void SystemTask::Work() {
           if (isSleeping && !isWakingUp) {
             GoToRunning();
           }
-          motorController.RunForDuration(35);
+          motorController.StartRinging();
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
           break;
         case Messages::SetOffAlarm: