Pass the timer as const

Doing this matches the other Controllers, which are also passed as const to the StatusIcons.
InfiniTimeOrg · Feb 20, 2024 · a36cde7 · a36cde7
1 parent 895f9a5
commit a36cde7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 17 deletions.
diff --git a/src/components/timer/Timer.cpp b/src/components/timer/Timer.cpp
@@ -11,7 +11,7 @@ void Timer::StartTimer(std::chrono::milliseconds duration) {
   xTimerStart(timer, 0);
 }
 
-std::chrono::milliseconds Timer::GetTimeRemaining() {
+std::chrono::milliseconds Timer::GetTimeRemaining() const {
   if (IsRunning()) {
     TickType_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
     return std::chrono::milliseconds(remainingTime * 1000 / configTICK_RATE_HZ);
@@ -23,6 +23,6 @@ void Timer::StopTimer() {
   xTimerStop(timer, 0);
 }
 
-bool Timer::IsRunning() {
+bool Timer::IsRunning() const {
   return (xTimerIsTimerActive(timer) == pdTRUE);
 }
diff --git a/src/components/timer/Timer.h b/src/components/timer/Timer.h
@@ -15,9 +15,9 @@ namespace Pinetime {
 
       void StopTimer();
 
-      std::chrono::milliseconds GetTimeRemaining();
+      std::chrono::milliseconds GetTimeRemaining() const;
 
-      bool IsRunning();
+      bool IsRunning() const;
 
     private:
       TimerHandle_t timer;

diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -18,20 +18,19 @@ using namespace Pinetime::Applications::Screens;
 WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
                                    const Controllers::Battery& batteryController,
                                    const Controllers::Ble& bleController,
+                                   const Controllers::Timer& timer,
                                    Controllers::NotificationManager& notificationManager,
                                    Controllers::Settings& settingsController,
                                    Controllers::HeartRateController& heartRateController,
                                    Controllers::MotionController& motionController,
-                                   Controllers::SimpleWeatherService& weatherService,
-                                   Controllers::Timer& timer)
+                                   Controllers::SimpleWeatherService& weatherService)
   : currentDateTime {{}},
     dateTimeController {dateTimeController},
     notificationManager {notificationManager},
     settingsController {settingsController},
     heartRateController {heartRateController},
     motionController {motionController},
     weatherService {weatherService},
-    timer {timer},
     statusIcons(batteryController, bleController, timer) {
 
   statusIcons.Create();

diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
@@ -31,12 +31,12 @@ namespace Pinetime {
         WatchFaceDigital(Controllers::DateTime& dateTimeController,
                          const Controllers::Battery& batteryController,
                          const Controllers::Ble& bleController,
+                         const Controllers::Timer& timer,
                          Controllers::NotificationManager& notificationManager,
                          Controllers::Settings& settingsController,
                          Controllers::HeartRateController& heartRateController,
                          Controllers::MotionController& motionController,
-                         Controllers::SimpleWeatherService& weather,
-                         Controllers::Timer& timer);
+                         Controllers::SimpleWeatherService& weather);
         ~WatchFaceDigital() override;
 
         void Refresh() override;
@@ -76,7 +76,6 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
         Controllers::SimpleWeatherService& weatherService;
-        Controllers::Timer& timer;
 
         lv_task_t* taskRefresh;
         Widgets::StatusIcons statusIcons;
@@ -92,12 +91,12 @@ namespace Pinetime {
         return new Screens::WatchFaceDigital(controllers.dateTimeController,
                                              controllers.batteryController,
                                              controllers.bleController,
+                                             controllers.timer,
                                              controllers.notificationManager,
                                              controllers.settingsController,
                                              controllers.heartRateController,
                                              controllers.motionController,
-                                             *controllers.weatherController,
-                                             controllers.timer);
+                                             *controllers.weatherController);
       };
 
       static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {

diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -34,7 +34,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
                              Controllers::MotorController& motorController,
                              Pinetime::Controllers::Settings& settingsController,
                              const Controllers::Ble& bleController,
-                             Controllers::Timer& timer)
+                             const Controllers::Timer& timer)
   : app {app},
     dateTimeController {dateTimeController},
     brightness {brightness},

diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
@@ -24,7 +24,7 @@ namespace Pinetime {
                       Controllers::MotorController& motorController,
                       Pinetime::Controllers::Settings& settingsController,
                       const Controllers::Ble& bleController,
-                      Controllers::Timer& timer);
+                      const Controllers::Timer& timer);
 
         ~QuickSettings() override;
 

diff --git a/src/displayapp/widgets/StatusIcons.cpp b/src/displayapp/widgets/StatusIcons.cpp
@@ -3,7 +3,7 @@
 
 using namespace Pinetime::Applications::Widgets;
 
-StatusIcons::StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, Controllers::Timer& timer)
+StatusIcons::StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, const Controllers::Timer& timer)
   : batteryIcon(true), batteryController {batteryController}, bleController {bleController}, timer {timer} {
 }
 

diff --git a/src/displayapp/widgets/StatusIcons.h b/src/displayapp/widgets/StatusIcons.h
@@ -13,7 +13,7 @@ namespace Pinetime {
     namespace Widgets {
       class StatusIcons {
       public:
-        StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, Controllers::Timer& timer);
+        StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, const Controllers::Timer& timer);
         void Align();
         void Create();
 
@@ -27,7 +27,7 @@ namespace Pinetime {
         Screens::BatteryIcon batteryIcon;
         const Pinetime::Controllers::Battery& batteryController;
         const Controllers::Ble& bleController;
-        Controllers::Timer& timer;
+        const Controllers::Timer& timer;
 
         Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
         Utility::DirtyValue<bool> powerPresent {};