displayapp: Make Battery class references const

Riksu9000 · Riksu9000 · commit 1c4b97382a97 · 2023-02-24T17:41:41.000+02:00
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
@@ -62,7 +62,7 @@ namespace {
 DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Components::LittleVgl& lvgl,
                        Drivers::Cst816S& touchPanel,
-                       Controllers::Battery& batteryController,
+                       const Controllers::Battery& batteryController,
                        Controllers::Ble& bleController,
                        Controllers::DateTime& dateTimeController,
                        Drivers::WatchdogView& watchdog,
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
@@ -54,7 +54,7 @@ namespace Pinetime {
       DisplayApp(Drivers::St7789& lcd,
                  Components::LittleVgl& lvgl,
                  Drivers::Cst816S&,
-                 Controllers::Battery& batteryController,
+                 const Controllers::Battery& batteryController,
                  Controllers::Ble& bleController,
                  Controllers::DateTime& dateTimeController,
                  Drivers::WatchdogView& watchdog,
@@ -81,7 +81,7 @@ namespace Pinetime {
       Pinetime::Drivers::St7789& lcd;
       Pinetime::Components::LittleVgl& lvgl;
       Pinetime::Drivers::Cst816S& touchPanel;
-      Pinetime::Controllers::Battery& batteryController;
+      const Pinetime::Controllers::Battery& batteryController;
       Pinetime::Controllers::Ble& bleController;
       Pinetime::Controllers::DateTime& dateTimeController;
       Pinetime::Drivers::WatchdogView& watchdog;
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
@@ -13,7 +13,7 @@ using namespace Pinetime::Applications;
 DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Components::LittleVgl& /*lvgl*/,
                        Drivers::Cst816S& /*touchPanel*/,
-                       Controllers::Battery& /*batteryController*/,
+                       const Controllers::Battery& /*batteryController*/,
                        Controllers::Ble& bleController,
                        Controllers::DateTime& /*dateTimeController*/,
                        Drivers::WatchdogView& /*watchdog*/,
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
@@ -49,7 +49,7 @@ namespace Pinetime {
       DisplayApp(Drivers::St7789& lcd,
                  Components::LittleVgl& lvgl,
                  Drivers::Cst816S&,
-                 Controllers::Battery& batteryController,
+                 const Controllers::Battery& batteryController,
                  Controllers::Ble& bleController,
                  Controllers::DateTime& dateTimeController,
                  Drivers::WatchdogView& watchdog,
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
@@ -20,7 +20,7 @@ auto ApplicationList::CreateScreenList() const {
 
 ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp* app,
                                  Pinetime::Controllers::Settings& settingsController,
-                                 Pinetime::Controllers::Battery& batteryController,
+                                 const Pinetime::Controllers::Battery& batteryController,
                                  Pinetime::Controllers::Ble& bleController,
                                  Controllers::DateTime& dateTimeController)
   : Screen(app),
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
@@ -18,7 +18,7 @@ namespace Pinetime {
       public:
         explicit ApplicationList(DisplayApp* app,
                                  Pinetime::Controllers::Settings& settingsController,
-                                 Pinetime::Controllers::Battery& batteryController,
+                                 const Pinetime::Controllers::Battery& batteryController,
                                  Pinetime::Controllers::Ble& bleController,
                                  Controllers::DateTime& dateTimeController);
         ~ApplicationList() override;
@@ -29,7 +29,7 @@ namespace Pinetime {
         std::unique_ptr<Screen> CreateScreen(unsigned int screenNum) const;
 
         Controllers::Settings& settingsController;
-        Pinetime::Controllers::Battery& batteryController;
+        const Pinetime::Controllers::Battery& batteryController;
         Pinetime::Controllers::Ble& bleController;
         Controllers::DateTime& dateTimeController;
 
diff --git a/src/displayapp/screens/BatteryInfo.cpp b/src/displayapp/screens/BatteryInfo.cpp
@@ -5,7 +5,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Battery& batteryController)
+BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, const Pinetime::Controllers::Battery& batteryController)
   : Screen(app), batteryController {batteryController} {
 
   batteryPercent = batteryController.PercentRemaining();
diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h
@@ -14,13 +14,13 @@ namespace Pinetime {
 
       class BatteryInfo : public Screen {
       public:
-        BatteryInfo(DisplayApp* app, Pinetime::Controllers::Battery& batteryController);
+        BatteryInfo(DisplayApp* app, const Pinetime::Controllers::Battery& batteryController);
         ~BatteryInfo() override;
 
         void Refresh() override;
 
       private:
-        Pinetime::Controllers::Battery& batteryController;
+        const Pinetime::Controllers::Battery& batteryController;
 
         lv_obj_t* voltage;
         lv_obj_t* percent;
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
@@ -19,7 +19,7 @@ using namespace Pinetime::Applications::Screens;
 
 Clock::Clock(DisplayApp* app,
              Controllers::DateTime& dateTimeController,
-             Controllers::Battery& batteryController,
+             const Controllers::Battery& batteryController,
              Controllers::Ble& bleController,
              Controllers::NotificationManager& notificationManager,
              Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
@@ -23,7 +23,7 @@ namespace Pinetime {
       public:
         Clock(DisplayApp* app,
               Controllers::DateTime& dateTimeController,
-              Controllers::Battery& batteryController,
+              const Controllers::Battery& batteryController,
               Controllers::Ble& bleController,
               Controllers::NotificationManager& notificationManager,
               Controllers::Settings& settingsController,
@@ -37,7 +37,7 @@ namespace Pinetime {
 
       private:
         Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
@@ -32,7 +32,7 @@ namespace {
 
 SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app,
                        Pinetime::Controllers::DateTime& dateTimeController,
-                       Pinetime::Controllers::Battery& batteryController,
+                       const Pinetime::Controllers::Battery& batteryController,
                        Pinetime::Controllers::BrightnessController& brightnessController,
                        Pinetime::Controllers::Ble& bleController,
                        Pinetime::Drivers::WatchdogView& watchdog,
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
@@ -24,7 +24,7 @@ namespace Pinetime {
       public:
         explicit SystemInfo(DisplayApp* app,
                             Pinetime::Controllers::DateTime& dateTimeController,
-                            Pinetime::Controllers::Battery& batteryController,
+                            const Pinetime::Controllers::Battery& batteryController,
                             Pinetime::Controllers::BrightnessController& brightnessController,
                             Pinetime::Controllers::Ble& bleController,
                             Pinetime::Drivers::WatchdogView& watchdog,
@@ -35,7 +35,7 @@ namespace Pinetime {
 
       private:
         Pinetime::Controllers::DateTime& dateTimeController;
-        Pinetime::Controllers::Battery& batteryController;
+        const Pinetime::Controllers::Battery& batteryController;
         Pinetime::Controllers::BrightnessController& brightnessController;
         Pinetime::Controllers::Ble& bleController;
         Pinetime::Drivers::WatchdogView& watchdog;
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
@@ -28,7 +28,7 @@ Tile::Tile(uint8_t screenID,
            uint8_t numScreens,
            DisplayApp* app,
            Controllers::Settings& settingsController,
-           Controllers::Battery& batteryController,
+           const Controllers::Battery& batteryController,
            Controllers::Ble& bleController,
            Controllers::DateTime& dateTimeController,
            std::array<Applications, 6>& applications)
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
@@ -25,7 +25,7 @@ namespace Pinetime {
                       uint8_t numScreens,
                       DisplayApp* app,
                       Controllers::Settings& settingsController,
-                      Controllers::Battery& batteryController,
+                      const Controllers::Battery& batteryController,
                       Controllers::Ble& bleController,
                       Controllers::DateTime& dateTimeController,
                       std::array<Applications, 6>& applications);
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -45,7 +45,7 @@ namespace {
 
 WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
                                  Controllers::DateTime& dateTimeController,
-                                 Controllers::Battery& batteryController,
+                                 const Controllers::Battery& batteryController,
                                  Controllers::Ble& bleController,
                                  Controllers::NotificationManager& notificationManager,
                                  Controllers::Settings& settingsController)
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
@@ -26,7 +26,7 @@ namespace Pinetime {
       public:
         WatchFaceAnalog(DisplayApp* app,
                         Controllers::DateTime& dateTimeController,
-                        Controllers::Battery& batteryController,
+                        const Controllers::Battery& batteryController,
                         Controllers::Ble& bleController,
                         Controllers::NotificationManager& notificationManager,
                         Controllers::Settings& settingsController);
@@ -74,7 +74,7 @@ namespace Pinetime {
         BatteryIcon batteryIcon;
 
         const Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -17,7 +17,7 @@ using namespace Pinetime::Applications::Screens;
 
 WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
                                                    Controllers::DateTime& dateTimeController,
-                                                   Controllers::Battery& batteryController,
+                                                   const Controllers::Battery& batteryController,
                                                    Controllers::Ble& bleController,
                                                    Controllers::NotificationManager& notificatioManager,
                                                    Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -26,7 +26,7 @@ namespace Pinetime {
       public:
         WatchFaceCasioStyleG7710(DisplayApp* app,
                                  Controllers::DateTime& dateTimeController,
-                                 Controllers::Battery& batteryController,
+                                 const Controllers::Battery& batteryController,
                                  Controllers::Ble& bleController,
                                  Controllers::NotificationManager& notificatioManager,
                                  Controllers::Settings& settingsController,
@@ -94,7 +94,7 @@ namespace Pinetime {
         BatteryIcon batteryIcon;
 
         Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificatioManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -16,7 +16,7 @@ using namespace Pinetime::Applications::Screens;
 
 WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
                                    Controllers::DateTime& dateTimeController,
-                                   Controllers::Battery& batteryController,
+                                   const Controllers::Battery& batteryController,
                                    Controllers::Ble& bleController,
                                    Controllers::NotificationManager& notificationManager,
                                    Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
@@ -26,7 +26,7 @@ namespace Pinetime {
       public:
         WatchFaceDigital(DisplayApp* app,
                          Controllers::DateTime& dateTimeController,
-                         Controllers::Battery& batteryController,
+                         const Controllers::Battery& batteryController,
                          Controllers::Ble& bleController,
                          Controllers::NotificationManager& notificationManager,
                          Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -22,7 +22,7 @@ namespace {
 
 WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app,
                                      Controllers::DateTime& dateTimeController,
-                                     Controllers::Battery& batteryController,
+                                     const Controllers::Battery& batteryController,
                                      Controllers::Ble& bleController,
                                      Controllers::NotificationManager& notificationManager,
                                      Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
@@ -23,7 +23,7 @@ namespace Pinetime {
       public:
         WatchFaceInfineat(DisplayApp* app,
                           Controllers::DateTime& dateTimeController,
-                          Controllers::Battery& batteryController,
+                          const Controllers::Battery& batteryController,
                           Controllers::Ble& bleController,
                           Controllers::NotificationManager& notificationManager,
                           Controllers::Settings& settingsController,
@@ -101,7 +101,7 @@ namespace Pinetime {
         } infineatColors;
 
         Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -46,7 +46,7 @@ namespace {
 
 WatchFacePineTimeStyle::WatchFacePineTimeStyle(DisplayApp* app,
                                                Controllers::DateTime& dateTimeController,
-                                               Controllers::Battery& batteryController,
+                                               const Controllers::Battery& batteryController,
                                                Controllers::Ble& bleController,
                                                Controllers::NotificationManager& notificationManager,
                                                Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h
@@ -26,7 +26,7 @@ namespace Pinetime {
       public:
         WatchFacePineTimeStyle(DisplayApp* app,
                                Controllers::DateTime& dateTimeController,
-                               Controllers::Battery& batteryController,
+                               const Controllers::Battery& batteryController,
                                Controllers::Ble& bleController,
                                Controllers::NotificationManager& notificationManager,
                                Controllers::Settings& settingsController,
@@ -103,7 +103,7 @@ namespace Pinetime {
         BatteryIcon batteryIcon;
 
         Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -15,7 +15,7 @@ using namespace Pinetime::Applications::Screens;
 
 WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
                                      Controllers::DateTime& dateTimeController,
-                                     Controllers::Battery& batteryController,
+                                     const Controllers::Battery& batteryController,
                                      Controllers::Ble& bleController,
                                      Controllers::NotificationManager& notificationManager,
                                      Controllers::Settings& settingsController,
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
@@ -24,7 +24,7 @@ namespace Pinetime {
       public:
         WatchFaceTerminal(DisplayApp* app,
                           Controllers::DateTime& dateTimeController,
-                          Controllers::Battery& batteryController,
+                          const Controllers::Battery& batteryController,
                           Controllers::Ble& bleController,
                           Controllers::NotificationManager& notificationManager,
                           Controllers::Settings& settingsController,
@@ -66,7 +66,7 @@ namespace Pinetime {
         lv_obj_t* connectState;
 
         Controllers::DateTime& dateTimeController;
-        Controllers::Battery& batteryController;
+        const Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -28,7 +28,7 @@ namespace {
 }
 
 QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
-                             Pinetime::Controllers::Battery& batteryController,
+                             const Pinetime::Controllers::Battery& batteryController,
                              Controllers::DateTime& dateTimeController,
                              Controllers::BrightnessController& brightness,
                              Controllers::MotorController& motorController,
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
@@ -18,7 +18,7 @@ namespace Pinetime {
       class QuickSettings : public Screen {
       public:
         QuickSettings(DisplayApp* app,
-                      Pinetime::Controllers::Battery& batteryController,
+                      const Pinetime::Controllers::Battery& batteryController,
                       Controllers::DateTime& dateTimeController,
                       Controllers::BrightnessController& brightness,
                       Controllers::MotorController& motorController,
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(Controllers::Battery& batteryController, Controllers::Ble& bleController)
+StatusIcons::StatusIcons(const Controllers::Battery& batteryController, Controllers::Ble& bleController)
   : batteryController {batteryController}, bleController {bleController} {
 }
 
diff --git a/src/displayapp/widgets/StatusIcons.h b/src/displayapp/widgets/StatusIcons.h
@@ -12,7 +12,7 @@ namespace Pinetime {
     namespace Widgets {
       class StatusIcons {
       public:
-        StatusIcons(Controllers::Battery& batteryController, Controllers::Ble& bleController);
+        StatusIcons(const Controllers::Battery& batteryController, Controllers::Ble& bleController);
         void Align();
         void Create();
 
@@ -24,7 +24,7 @@ namespace Pinetime {
 
       private:
         Screens::BatteryIcon batteryIcon;
-        Pinetime::Controllers::Battery& batteryController;
+        const Pinetime::Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
 
         Screens::DirtyValue<uint8_t> batteryPercentRemaining {};
