From 40f7e1c7be6882e01058b5ccf64d5005c6105346 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Tue, 11 Apr 2023 12:18:49 +0300 Subject: [PATCH] TimerController: Rename to Timer --- src/CMakeLists.txt | 6 +++--- .../timer/{TimerController.cpp => Timer.cpp} | 12 ++++++------ .../timer/{TimerController.h => Timer.h} | 4 ++-- src/displayapp/DisplayApp.cpp | 4 ++-- src/displayapp/DisplayApp.h | 4 ++-- src/displayapp/screens/Timer.cpp | 16 ++++++++-------- src/displayapp/screens/Timer.h | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) rename src/components/timer/{TimerController.cpp => Timer.cpp} (59%) rename src/components/timer/{TimerController.h => Timer.h} (75%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a6a5bf54..574a0ad5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -472,7 +472,7 @@ list(APPEND SOURCE_FILES components/firmwarevalidator/FirmwareValidator.cpp components/motor/MotorController.cpp components/settings/Settings.cpp - components/timer/TimerController.cpp + components/timer/Timer.cpp components/alarm/AlarmController.cpp components/fs/FS.cpp drivers/Cst816s.cpp @@ -537,7 +537,7 @@ list(APPEND RECOVERY_SOURCE_FILES components/ble/MotionService.cpp components/firmwarevalidator/FirmwareValidator.cpp components/settings/Settings.cpp - components/timer/TimerController.cpp + components/timer/Timer.cpp components/alarm/AlarmController.cpp drivers/Cst816s.cpp FreeRTOS/port.c @@ -653,7 +653,7 @@ set(INCLUDE_FILES components/ble/MotionService.h components/ble/weather/WeatherService.h components/settings/Settings.h - components/timer/TimerController.h + components/timer/Timer.h components/alarm/AlarmController.h drivers/Cst816s.h FreeRTOS/portmacro.h diff --git a/src/components/timer/TimerController.cpp b/src/components/timer/Timer.cpp similarity index 59% rename from src/components/timer/TimerController.cpp rename to src/components/timer/Timer.cpp index e3aa07af..279178cd 100644 --- a/src/components/timer/TimerController.cpp +++ b/src/components/timer/Timer.cpp @@ -1,17 +1,17 @@ -#include "components/timer/TimerController.h" +#include "components/timer/Timer.h" using namespace Pinetime::Controllers; -TimerController::TimerController(void* const timerData, TimerCallbackFunction_t timerCallbackFunction) { +Timer::Timer(void* const timerData, TimerCallbackFunction_t timerCallbackFunction) { timer = xTimerCreate("Timer", 1, pdFALSE, timerData, timerCallbackFunction); } -void TimerController::StartTimer(std::chrono::milliseconds duration) { +void Timer::StartTimer(std::chrono::milliseconds duration) { xTimerChangePeriod(timer, pdMS_TO_TICKS(duration.count()), 0); xTimerStart(timer, 0); } -std::chrono::milliseconds TimerController::GetTimeRemaining() { +std::chrono::milliseconds Timer::GetTimeRemaining() { if (IsRunning()) { TickType_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount(); return std::chrono::milliseconds(remainingTime * 1000 / configTICK_RATE_HZ); @@ -19,10 +19,10 @@ std::chrono::milliseconds TimerController::GetTimeRemaining() { return std::chrono::milliseconds(0); } -void TimerController::StopTimer() { +void Timer::StopTimer() { xTimerStop(timer, 0); } -bool TimerController::IsRunning() { +bool Timer::IsRunning() { return (xTimerIsTimerActive(timer) == pdTRUE); } diff --git a/src/components/timer/TimerController.h b/src/components/timer/Timer.h similarity index 75% rename from src/components/timer/TimerController.h rename to src/components/timer/Timer.h index 1d2a51df..2469666f 100644 --- a/src/components/timer/TimerController.h +++ b/src/components/timer/Timer.h @@ -7,9 +7,9 @@ namespace Pinetime { namespace Controllers { - class TimerController { + class Timer { public: - TimerController(void* timerData, TimerCallbackFunction_t timerCallbackFunction); + Timer(void* timerData, TimerCallbackFunction_t timerCallbackFunction); void StartTimer(std::chrono::milliseconds duration); diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 80b6e201..fe2ee213 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -95,7 +95,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd, touchHandler {touchHandler}, filesystem {filesystem}, lvgl {lcd, filesystem}, - timerController(this, TimerCallback) { + timer(this, TimerCallback) { } void DisplayApp::Start(System::BootErrors error) { @@ -452,7 +452,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio Screens::Notifications::Modes::Preview); break; case Apps::Timer: - currentScreen = std::make_unique(timerController); + currentScreen = std::make_unique(timer); break; case Apps::Alarm: currentScreen = std::make_unique(alarmController, settingsController.GetClockType(), *systemTask, motorController); diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index bd004d6e..f537651d 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -12,7 +12,7 @@ #include "components/firmwarevalidator/FirmwareValidator.h" #include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" -#include "components/timer/TimerController.h" +#include "components/timer/Timer.h" #include "components/alarm/AlarmController.h" #include "touchhandler/TouchHandler.h" @@ -94,7 +94,7 @@ namespace Pinetime { Pinetime::Controllers::FirmwareValidator validator; Pinetime::Components::LittleVgl lvgl; - Pinetime::Controllers::TimerController timerController; + Pinetime::Controllers::Timer timer; TaskHandle_t taskHandle; diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index df78a5a0..d9488740 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -17,7 +17,7 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) { } } -Timer::Timer(Controllers::TimerController& timerController) : timerController {timerController} { +Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76); @@ -85,7 +85,7 @@ void Timer::MaskReset() { buttonPressing = false; // A click event is processed before a release event, // so the release event would override the "Pause" text without this check - if (!timerController.IsRunning()) { + if (!timer.IsRunning()) { lv_label_set_text_static(txtPlayPause, "Start"); } maskPosition = 0; @@ -103,8 +103,8 @@ void Timer::UpdateMask() { } void Timer::Refresh() { - if (timerController.IsRunning()) { - auto secondsRemaining = std::chrono::duration_cast(timerController.GetTimeRemaining()); + if (timer.IsRunning()) { + auto secondsRemaining = std::chrono::duration_cast(timer.GetTimeRemaining()); minuteCounter.SetValue(secondsRemaining.count() / 60); secondCounter.SetValue(secondsRemaining.count() % 60); } else if (buttonPressing && xTaskGetTickCount() > pressTime + pdMS_TO_TICKS(150)) { @@ -132,15 +132,15 @@ void Timer::SetTimerStopped() { } void Timer::ToggleRunning() { - if (timerController.IsRunning()) { - auto secondsRemaining = std::chrono::duration_cast(timerController.GetTimeRemaining()); + if (timer.IsRunning()) { + auto secondsRemaining = std::chrono::duration_cast(timer.GetTimeRemaining()); minuteCounter.SetValue(secondsRemaining.count() / 60); secondCounter.SetValue(secondsRemaining.count() % 60); - timerController.StopTimer(); + timer.StopTimer(); SetTimerStopped(); } else if (secondCounter.GetValue() + minuteCounter.GetValue() > 0) { auto timerDuration = std::chrono::minutes(minuteCounter.GetValue()) + std::chrono::seconds(secondCounter.GetValue()); - timerController.StartTimer(timerDuration); + timer.StartTimer(timerDuration); Refresh(); SetTimerRunning(); } diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h index a6e26063..e452a9d9 100644 --- a/src/displayapp/screens/Timer.h +++ b/src/displayapp/screens/Timer.h @@ -7,12 +7,12 @@ #include "displayapp/widgets/Counter.h" #include -#include "components/timer/TimerController.h" +#include "components/timer/Timer.h" namespace Pinetime::Applications::Screens { class Timer : public Screen { public: - Timer(Controllers::TimerController& timerController); + Timer(Controllers::Timer& timerController); ~Timer() override; void Refresh() override; void Reset(); @@ -24,7 +24,7 @@ namespace Pinetime::Applications::Screens { void SetTimerRunning(); void SetTimerStopped(); void UpdateMask(); - Controllers::TimerController& timerController; + Controllers::Timer& timer; lv_obj_t* btnPlayPause; lv_obj_t* txtPlayPause;