summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/timer/TimerController.cpp32
-rw-r--r--src/components/timer/TimerController.h24
-rw-r--r--src/displayapp/screens/Alarm.h1
-rw-r--r--src/displayapp/screens/Timer.cpp64
-rw-r--r--src/displayapp/screens/Timer.h16
-rw-r--r--src/systemtask/SystemTask.cpp2
6 files changed, 91 insertions, 48 deletions
diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/TimerController.cpp
index eeee61f..55b7d56 100644
--- a/src/components/timer/TimerController.cpp
+++ b/src/components/timer/TimerController.cpp
@@ -3,9 +3,11 @@
using namespace Pinetime::Controllers;
-void TimerCallback(TimerHandle_t xTimer) {
- auto* controller = static_cast<TimerController*>(pvTimerGetTimerID(xTimer));
- controller->OnTimerEnd();
+namespace {
+ void TimerCallback(TimerHandle_t xTimer) {
+ auto* controller = static_cast<TimerController*>(pvTimerGetTimerID(xTimer));
+ controller->OnTimerEnd();
+ }
}
void TimerController::Init(Pinetime::System::SystemTask* systemTask) {
@@ -16,25 +18,37 @@ void TimerController::Init(Pinetime::System::SystemTask* systemTask) {
void TimerController::StartTimer(uint32_t duration) {
xTimerChangePeriod(timer, pdMS_TO_TICKS(duration), 0);
xTimerStart(timer, 0);
+ timerRunning = true;
+ overtime = false;
}
-uint32_t TimerController::GetTimeRemaining() {
+int32_t TimerController::GetSecondsRemaining() {
if (IsRunning()) {
- TickType_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
- return (remainingTime * 1000 / configTICK_RATE_HZ);
+ int32_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
+ return remainingTime / configTICK_RATE_HZ;
}
return 0;
}
void TimerController::StopTimer() {
xTimerStop(timer, 0);
+ timerRunning = false;
+ if (overtime) {
+ StopAlerting();
+ overtime = false;
+ }
}
-bool TimerController::IsRunning() {
- return (xTimerIsTimerActive(timer) == pdTRUE);
+void TimerController::StopAlerting() {
+ if (systemTask != nullptr) {
+ systemTask->PushMessage(System::Messages::StopRinging);
+ }
}
void TimerController::OnTimerEnd() {
- systemTask->PushMessage(System::Messages::OnTimerDone);
+ 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 93d8afc..c3bdc2a 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -2,6 +2,7 @@
#include <FreeRTOS.h>
#include <timers.h>
+#include <cstdint>
namespace Pinetime {
namespace System {
@@ -13,21 +14,28 @@ namespace Pinetime {
public:
TimerController() = default;
- void Init(System::SystemTask* systemTask);
-
void StartTimer(uint32_t duration);
-
void StopTimer();
-
- uint32_t GetTimeRemaining();
-
- bool IsRunning();
+ void StopAlerting();
+ int32_t GetSecondsRemaining();
+ inline bool IsOvertime() {
+ return overtime;
+ }
+ inline bool IsRunning() {
+ return timerRunning;
+ }
void OnTimerEnd();
+ protected:
+ friend class Pinetime::System::SystemTask;
+ void Init(System::SystemTask* systemTask);
+
private:
System::SystemTask* systemTask = nullptr;
TimerHandle_t timer;
+ 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 80e446f..07adad3 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 9ef620a..002c9e3 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -44,15 +44,42 @@ void Timer::CreateButtons() {
lv_label_set_text_static(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} {
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_MAKE(0xb0, 0xb0, 0xb0));
- 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_CENTER, 0, -25);
btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
@@ -62,23 +89,34 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
lv_obj_align(btnPlayPause, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
txtPlayPause = lv_label_create(btnPlayPause, nullptr);
if (timerController.IsRunning()) {
- lv_label_set_text_static(txtPlayPause, Symbols::pause);
+ lv_label_set_text(txtPlayPause, overtime ? Symbols::stop : Symbols::pause);
} else {
lv_label_set_text_static(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();
+ }
}
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);
}
}
@@ -87,17 +125,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_static(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_static(txtPlayPause, Symbols::pause);
timerController.StartTimer((secondsToSet + minutesToSet * 60) * 1000);
+ // inlined destroyButtons()
lv_obj_del(btnSecondsDown);
btnSecondsDown = nullptr;
lv_obj_del(btnSecondsUp);
@@ -147,9 +180,6 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
}
void Timer::SetDone() {
- lv_label_set_text_static(time, "00:00");
- lv_label_set_text_static(txtPlayPause, Symbols::play);
- secondsToSet = 0;
- minutesToSet = 0;
- CreateButtons();
+ lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
+ lv_label_set_text_static(txtPlayPause, Symbols::stop);
}
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index c1f7f9e..c0e0885 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -24,18 +24,10 @@ namespace Pinetime::Applications::Screens {
uint8_t secondsToSet = 0;
uint8_t minutesToSet = 0;
Controllers::TimerController& timerController;
- 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 3353a45..775106f 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -305,7 +305,7 @@ void SystemTask::Work() {
if (state == SystemTaskState::Sleeping) {
GoToRunning();
}
- motorController.RunForDuration(35);
+ motorController.StartRinging();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
break;
case Messages::SetOffAlarm:
generated by cgit v0.10.2 at 2026-01-09 05:18:39 (GMT)