summaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
authorFlorian <fgrauper@gmail.com>2021-05-20 20:43:54 +0200
committerGitHub <noreply@github.com>2021-05-20 20:43:54 +0200
commit13e3463276114dff838fc8fe281754eecfbe9538 (patch)
tree55ded8860f26ff7f5f1ffb585d35a252f36f9148 /src/components
parent8c3b250dbfe17be61462adc8f84760ce9a648e55 (diff)
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
Diffstat (limited to 'src/components')
-rw-r--r--src/components/motor/MotorController.cpp1
-rw-r--r--src/components/timer/TimerController.cpp64
-rw-r--r--src/components/timer/TimerController.h36
3 files changed, 100 insertions, 1 deletions
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