Integrate hatmajster's timer code

6 files changed, 92 insertions, 75 deletions

diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
index 79e44d6..d6f8ffd 100644
--- a/src/components/timer/TimerController.cpp
+++ b/src/components/timer/TimerController.cpp
@@ -9,18 +9,16 @@
 
 using namespace Pinetime::Controllers;
 
-
 APP_TIMER_DEF(timerAppTimer);
 
 namespace {
   void TimerEnd(void* p_context) {
-    auto* controller = static_cast<Pinetime::Controllers::TimerController*> (p_context);
-    if(controller != nullptr)
+    auto* controller = static_cast<Pinetime::Controllers::TimerController*>(p_context);
+    if (controller != nullptr)
       controller->OnTimerEnd();
   }
 }
 
-
 void TimerController::Init() {
   app_timer_create(&timerAppTimer, APP_TIMER_MODE_SINGLE_SHOT, TimerEnd);
 }
@@ -31,37 +29,37 @@ void TimerController::StartTimer(uint32_t duration) {
   app_timer_start(timerAppTimer, APP_TIMER_TICKS(duration), this);
   endTicks = currentTicks + APP_TIMER_TICKS(duration);
   timerRunning = true;
+  overtime = false;
 }
 
-uint32_t TimerController::GetTimeRemaining() {
+int32_t TimerController::GetSecondsRemaining() {
   if (!timerRunning) {
     return 0;
   }
   auto currentTicks = xTaskGetTickCount();
-  
-  TickType_t deltaTicks = 0;
-  if (currentTicks > endTicks) {
-    deltaTicks = 0xffffffff - currentTicks;
-    deltaTicks += (endTicks + 1);
-  } else {
-    deltaTicks = endTicks - currentTicks;
-  }
-  
-  return (static_cast<TickType_t>(deltaTicks) / static_cast<TickType_t>(configTICK_RATE_HZ)) * 1000;
+
+  int32_t deltaTicks = static_cast<int32_t>(endTicks) - static_cast<int32_t>(currentTicks);
+
+  return (deltaTicks / static_cast<int32_t>(configTICK_RATE_HZ));
 }
 
 void TimerController::StopTimer() {
   app_timer_stop(timerAppTimer);
   timerRunning = false;
+  overtime = false;
 }
 
-bool TimerController::IsRunning() {
-  return timerRunning;
+void TimerController::StopAlerting() {
+  if (systemTask != nullptr) {
+    systemTask->PushMessage(System::Messages::StopRinging);
+  }
 }
+
 void TimerController::OnTimerEnd() {
-  timerRunning = false;
-  if(systemTask != nullptr)
+  overtime = true;
+  if (systemTask != nullptr) {
     systemTask->PushMessage(System::Messages::OnTimerDone);
+  }
 }
 
 void TimerController::Register(Pinetime::System::SystemTask* systemTask) {
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
index fa7bc90..dbc9863 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -9,20 +9,22 @@ namespace Pinetime {
     class SystemTask;
   }
   namespace Controllers {
-    
+
     class TimerController {
     public:
       TimerController() = default;
-      
+
       void Init();
-      
       void StartTimer(uint32_t duration);
-      
       void StopTimer();
-      
-      uint32_t GetTimeRemaining();
-      
-      bool IsRunning();
+      void StopAlerting();
+      int32_t GetSecondsRemaining();
+      bool IsOvertime() {
+        return overtime;
+      }
+      bool IsRunning() {
+        return timerRunning;
+      }
 
       void OnTimerEnd();
 
@@ -32,6 +34,7 @@ namespace Pinetime {
       System::SystemTask* systemTask = nullptr;
       TickType_t endTicks;
       bool timerRunning = false;
+      bool overtime = false;
     };
   }
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index f74dd68..fed8d66 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -54,7 +54,6 @@ namespace Pinetime {
         enum class EnableButtonState { On, Off, Alerting };
         void SetRecurButtonState();
         void SetSwitchState(lv_anim_enable_t anim);
-        void SetAlarm();
         void ShowInfo();
         void HideInfo();
         void ToggleRecurrence();
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index 5cd496c..ca15a2f 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -14,40 +14,54 @@ void Timer::CreateButtons() {
   btnMinutesUp = lv_btn_create(lv_scr_act(), nullptr);
   btnMinutesUp->user_data = this;
   lv_obj_set_event_cb(btnMinutesUp, btnEventHandler);
-  lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -80);
-  lv_obj_set_height(btnMinutesUp, 40);
-  lv_obj_set_width(btnMinutesUp, 60);
+  lv_obj_set_size(btnMinutesUp, 60, 40);
+  lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -85);
   txtMUp = lv_label_create(btnMinutesUp, nullptr);
   lv_label_set_text(txtMUp, "+");
 
   btnMinutesDown = lv_btn_create(lv_scr_act(), nullptr);
   btnMinutesDown->user_data = this;
   lv_obj_set_event_cb(btnMinutesDown, btnEventHandler);
-  lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, +40);
-  lv_obj_set_height(btnMinutesDown, 40);
-  lv_obj_set_width(btnMinutesDown, 60);
+  lv_obj_set_size(btnMinutesDown, 60, 40);
+  lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, +35);
   txtMDown = lv_label_create(btnMinutesDown, nullptr);
   lv_label_set_text(txtMDown, "-");
 
   btnSecondsUp = lv_btn_create(lv_scr_act(), nullptr);
   btnSecondsUp->user_data = this;
   lv_obj_set_event_cb(btnSecondsUp, btnEventHandler);
-  lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 10, -80);
-  lv_obj_set_height(btnSecondsUp, 40);
-  lv_obj_set_width(btnSecondsUp, 60);
+  lv_obj_set_size(btnSecondsUp, 60, 40);
+  lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, -85);
   txtSUp = lv_label_create(btnSecondsUp, nullptr);
   lv_label_set_text(txtSUp, "+");
 
   btnSecondsDown = lv_btn_create(lv_scr_act(), nullptr);
   btnSecondsDown->user_data = this;
   lv_obj_set_event_cb(btnSecondsDown, btnEventHandler);
-  lv_obj_align(btnSecondsDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 10, +40);
-  lv_obj_set_height(btnSecondsDown, 40);
-  lv_obj_set_width(btnSecondsDown, 60);
+  lv_obj_set_size(btnSecondsDown, 60, 40);
+  lv_obj_align(btnSecondsDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, +35);
   txtSDown = lv_label_create(btnSecondsDown, nullptr);
   lv_label_set_text(txtSDown, "-");
 }
 
+void Timer::stop() {
+  int32_t secondsRemaining = timerController.GetSecondsRemaining();
+  if (timerController.IsOvertime()) {
+    minutesToSet = 0;
+    secondsToSet = 0;
+    secondsRemaining = 0;
+  } else {
+    minutesToSet = secondsRemaining / 60;
+    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);
+  createButtons();
+}
+
 Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
   : Screen(app), running {true}, timerController {timerController} {
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
@@ -59,37 +73,57 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
 
   time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
-  lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
 
-  uint32_t seconds = timerController.GetTimeRemaining() / 1000;
+  int32_t seconds = timerController.GetSecondsRemaining();
+  bool overtime = timerController.IsOvertime();
+
+  if (overtime) {
+    seconds = -seconds + 1; // "+ 1" is to not show -00:00 again after +00:00
+    lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
+  } else {
+    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", seconds / 60, seconds % 60);
 
-  lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
+  lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25);
 
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;
   lv_obj_set_event_cb(btnPlayPause, btnEventHandler);
-  lv_obj_align(btnPlayPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, -10);
-  lv_obj_set_height(btnPlayPause, 40);
+  lv_obj_set_size(btnPlayPause, 115, 50);
+  lv_obj_align(btnPlayPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
   txtPlayPause = lv_label_create(btnPlayPause, nullptr);
   if (timerController.IsRunning()) {
-    lv_label_set_text(txtPlayPause, Symbols::pause);
+    lv_label_set_text(txtPlayPause, overtime ? Symbols::stop : Symbols::pause);
   } else {
     lv_label_set_text(txtPlayPause, Symbols::play);
     CreateButtons();
   }
-
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Timer::~Timer() {
   lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
+  if (timerController.IsRunning() && timerController.IsOvertime()) {
+    timerController.StopTimer();
+    timerController.StopAlerting();
+  }
 }
 
 void Timer::Refresh() {
   if (timerController.IsRunning()) {
-    uint32_t seconds = timerController.GetTimeRemaining() / 1000;
+    int32_t seconds = timerController.GetSecondsRemaining();
+    if (timerController.IsOvertime()) {
+      seconds = -seconds + 1; // "+ 1" is to not show -00:00 again after +00:00
+
+      // safety measures, lets not overflow counter as it will display badly
+      if (seconds >= 100 * 60) {
+        stop();
+        return;
+      }
+    }
     lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
   }
 }
@@ -98,17 +132,12 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
   if (event == LV_EVENT_CLICKED) {
     if (obj == btnPlayPause) {
       if (timerController.IsRunning()) {
-        lv_label_set_text(txtPlayPause, Symbols::play);
-        uint32_t seconds = timerController.GetTimeRemaining() / 1000;
-        minutesToSet = seconds / 60;
-        secondsToSet = seconds % 60;
-        timerController.StopTimer();
-        CreateButtons();
-
+        stop();
       } else if (secondsToSet + minutesToSet > 0) {
         lv_label_set_text(txtPlayPause, Symbols::pause);
         timerController.StartTimer((secondsToSet + minutesToSet * 60) * 1000);
 
+        // inlined destroyButtons()
         lv_obj_del(btnSecondsDown);
         btnSecondsDown = nullptr;
         lv_obj_del(btnSecondsUp);
@@ -157,10 +186,7 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-void Timer::SetDone() {
-  lv_label_set_text(time, "00:00");
-  lv_label_set_text(txtPlayPause, Symbols::play);
-  secondsToSet = 0;
-  minutesToSet = 0;
-  CreateButtons();
+void Timer::setDone() {
+  lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
+  lv_label_set_text(txtPlayPause, Symbols::stop);
 }
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 93e84c8..76aac58 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -24,19 +24,10 @@ namespace Pinetime::Applications::Screens {
     uint8_t secondsToSet = 0;
     uint8_t minutesToSet = 0;
     Controllers::TimerController& timerController;
-    lv_obj_t* backgroundLabel;
-    lv_obj_t* time;
-    lv_obj_t* msecTime;
-    lv_obj_t* btnPlayPause;
-    lv_obj_t* txtPlayPause;
-    lv_obj_t* btnMinutesUp;
-    lv_obj_t* btnMinutesDown;
-    lv_obj_t* btnSecondsUp;
-    lv_obj_t* btnSecondsDown;
-    lv_obj_t* txtMUp;
-    lv_obj_t* txtMDown;
-    lv_obj_t* txtSUp;
-    lv_obj_t* txtSDown;
+    void stop();
+
     lv_task_t* taskRefresh;
+    lv_obj_t *time, *btnPlayPause, *txtPlayPause, *btnMinutesUp, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
+      *txtMDown, *txtSUp, *txtSDown;
   };
 }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 75136a0..0411cf2 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -306,7 +306,7 @@ void SystemTask::Work() {
           if (isSleeping && !isWakingUp) {
             GoToRunning();
           }
-          motorController.RunForDuration(35);
+          motorController.StartRinging();
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
           break;
         case Messages::SetOffAlarm: