From 13e3463276114dff838fc8fe281754eecfbe9538 Mon Sep 17 00:00:00 2001
From: Florian <fgrauper@gmail.com>
Date: Thu, 20 May 2021 20:43:54 +0200
Subject: Timer App (#355)

* built timer app

* Style improvements

* making sure buttons stay hidden when the app is reopened and reappear after the timer runs out

* more sensible calculations of time deltas. eliminated that mysterious scaling factor

* changing the timer icon
---
 src/components/motor/MotorController.cpp |  1 -
 src/components/timer/TimerController.cpp | 64 ++++++++++++++++++++++++++++++++
 src/components/timer/TimerController.h   | 36 ++++++++++++++++++
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 src/components/timer/TimerController.cpp
 create mode 100644 src/components/timer/TimerController.h

(limited to 'src/components')

diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index a834ab6b..3afa0ced 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -13,7 +13,6 @@ MotorController::MotorController(Controllers::Settings& settingsController) : se
 void MotorController::Init() {
   nrf_gpio_cfg_output(pinMotor);
   nrf_gpio_pin_set(pinMotor);
-  app_timer_init();
   app_timer_create(&vibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
 }
 
diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
new file mode 100644
index 00000000..3b25901c
--- /dev/null
+++ b/src/components/timer/TimerController.cpp
@@ -0,0 +1,64 @@
+//
+// Created by florian on 16.05.21.
+//
+
+#include "TimerController.h"
+#include "systemtask/SystemTask.h"
+#include "app_timer.h"
+#include "task.h"
+
+using namespace Pinetime::Controllers;
+
+
+APP_TIMER_DEF(timerAppTimer);
+
+
+TimerController::TimerController(System::SystemTask& systemTask) : systemTask{systemTask} {
+}
+
+
+void TimerController::Init() {
+  app_timer_create(&timerAppTimer, APP_TIMER_MODE_SINGLE_SHOT, timerEnd);
+  
+}
+
+void TimerController::StartTimer(uint32_t duration) {
+  app_timer_stop(timerAppTimer);
+  auto currentTicks = xTaskGetTickCount();
+  app_timer_start(timerAppTimer, APP_TIMER_TICKS(duration), this);
+  endTicks = currentTicks + APP_TIMER_TICKS(duration);
+  timerRunning = true;
+}
+
+uint32_t TimerController::GetTimeRemaining() {
+  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;
+}
+
+void TimerController::timerEnd(void* p_context) {
+  
+  auto* controller = static_cast<Controllers::TimerController*> (p_context);
+  controller->timerRunning = false;
+  controller->systemTask.PushMessage(System::SystemTask::Messages::OnTimerDone);
+}
+
+void TimerController::StopTimer() {
+  app_timer_stop(timerAppTimer);
+  timerRunning = false;
+}
+
+bool TimerController::IsRunning() {
+  return timerRunning;
+}
\ No newline at end of file
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
new file mode 100644
index 00000000..5a0b293e
--- /dev/null
+++ b/src/components/timer/TimerController.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include "app_timer.h"
+#include "portmacro_cmsis.h"
+
+namespace Pinetime {
+  namespace System {
+    class SystemTask;
+  }
+  namespace Controllers {
+    
+    class TimerController {
+    public:
+      TimerController(Pinetime::System::SystemTask& systemTask);
+      
+      void Init();
+      
+      void StartTimer(uint32_t duration);
+      
+      void StopTimer();
+      
+      uint32_t GetTimeRemaining();
+      
+      bool IsRunning();
+    
+    private:
+      System::SystemTask& systemTask;
+      
+      static void timerEnd(void* p_context);
+  
+      TickType_t endTicks;
+      bool timerRunning = false;
+    };
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3