2 files changed, 23 insertions, 17 deletions

diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
index 31635a5..9456909 100644
--- a/src/components/timer/TimerController.cpp
+++ b/src/components/timer/TimerController.cpp
@@ -28,35 +28,36 @@ void TimerController::StartTimer(uint32_t duration) {
   xTimerStart(timerAppTimer, 0);
   endTicks = currentTicks + durationTicks;
   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;
-  }
+  int32_t deltaTicks = static_cast<int32_t>(endTicks) - static_cast<int32_t>(currentTicks);
 
-  return (static_cast<TickType_t>(deltaTicks) / static_cast<TickType_t>(configTICK_RATE_HZ)) * 1000;
+  return (deltaTicks / static_cast<int32_t>(configTICK_RATE_HZ));
 }
 
 void TimerController::StopTimer() {
   xTimerStop(timerAppTimer, 0);
   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);
+  }
 }
+
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
index 24d7150..b1b8d3c 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -18,10 +18,14 @@ namespace Pinetime {
 
       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();
 
@@ -34,6 +38,7 @@ namespace Pinetime {
       TimerHandle_t timerAppTimer;
       TickType_t endTicks;
       bool timerRunning = false;
+      bool overtime = false;
     };
   }
 }
\ No newline at end of file