Skip to content

Commit ff34cf1

Browse files
committed
watchdog: Replace WatchdogView with const Watchdog
1 parent 26478d9 commit ff34cf1

8 files changed

Lines changed: 12 additions & 26 deletions

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
6565
const Controllers::Battery& batteryController,
6666
const Controllers::Ble& bleController,
6767
Controllers::DateTime& dateTimeController,
68-
Drivers::WatchdogView& watchdog,
68+
const Drivers::Watchdog& watchdog,
6969
Pinetime::Controllers::NotificationManager& notificationManager,
7070
Pinetime::Controllers::HeartRateController& heartRateController,
7171
Controllers::Settings& settingsController,

src/displayapp/DisplayApp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Pinetime {
2727
namespace Drivers {
2828
class St7789;
2929
class Cst816S;
30-
class WatchdogView;
30+
class Watchdog;
3131
}
3232

3333
namespace Controllers {
@@ -57,7 +57,7 @@ namespace Pinetime {
5757
const Controllers::Battery& batteryController,
5858
const Controllers::Ble& bleController,
5959
Controllers::DateTime& dateTimeController,
60-
Drivers::WatchdogView& watchdog,
60+
const Drivers::Watchdog& watchdog,
6161
Pinetime::Controllers::NotificationManager& notificationManager,
6262
Pinetime::Controllers::HeartRateController& heartRateController,
6363
Controllers::Settings& settingsController,
@@ -84,7 +84,7 @@ namespace Pinetime {
8484
const Pinetime::Controllers::Battery& batteryController;
8585
const Pinetime::Controllers::Ble& bleController;
8686
Pinetime::Controllers::DateTime& dateTimeController;
87-
Pinetime::Drivers::WatchdogView& watchdog;
87+
const Pinetime::Drivers::Watchdog& watchdog;
8888
Pinetime::System::SystemTask* systemTask = nullptr;
8989
Pinetime::Controllers::NotificationManager& notificationManager;
9090
Pinetime::Controllers::HeartRateController& heartRateController;

src/displayapp/DisplayAppRecovery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
1616
const Controllers::Battery& /*batteryController*/,
1717
const Controllers::Ble& bleController,
1818
Controllers::DateTime& /*dateTimeController*/,
19-
Drivers::WatchdogView& /*watchdog*/,
19+
const Drivers::Watchdog& /*watchdog*/,
2020
Pinetime::Controllers::NotificationManager& /*notificationManager*/,
2121
Pinetime::Controllers::HeartRateController& /*heartRateController*/,
2222
Controllers::Settings& /*settingsController*/,

src/displayapp/DisplayAppRecovery.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Pinetime {
2020
namespace Drivers {
2121
class St7789;
2222
class Cst816S;
23-
class WatchdogView;
23+
class Watchdog;
2424
}
2525

2626
namespace Controllers {
@@ -52,7 +52,7 @@ namespace Pinetime {
5252
const Controllers::Battery& batteryController,
5353
const Controllers::Ble& bleController,
5454
Controllers::DateTime& dateTimeController,
55-
Drivers::WatchdogView& watchdog,
55+
const Drivers::Watchdog& watchdog,
5656
Pinetime::Controllers::NotificationManager& notificationManager,
5757
Pinetime::Controllers::HeartRateController& heartRateController,
5858
Controllers::Settings& settingsController,

src/displayapp/screens/SystemInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app,
3535
const Pinetime::Controllers::Battery& batteryController,
3636
Pinetime::Controllers::BrightnessController& brightnessController,
3737
const Pinetime::Controllers::Ble& bleController,
38-
Pinetime::Drivers::WatchdogView& watchdog,
38+
const Pinetime::Drivers::Watchdog& watchdog,
3939
Pinetime::Controllers::MotionController& motionController,
4040
const Pinetime::Drivers::Cst816S& touchPanel)
4141
: app {app},

src/displayapp/screens/SystemInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Pinetime {
1313
}
1414

1515
namespace Drivers {
16-
class WatchdogView;
16+
class Watchdog;
1717
}
1818

1919
namespace Applications {
@@ -27,7 +27,7 @@ namespace Pinetime {
2727
const Pinetime::Controllers::Battery& batteryController,
2828
Pinetime::Controllers::BrightnessController& brightnessController,
2929
const Pinetime::Controllers::Ble& bleController,
30-
Pinetime::Drivers::WatchdogView& watchdog,
30+
const Pinetime::Drivers::Watchdog& watchdog,
3131
Pinetime::Controllers::MotionController& motionController,
3232
const Pinetime::Drivers::Cst816S& touchPanel);
3333
~SystemInfo() override;
@@ -39,7 +39,7 @@ namespace Pinetime {
3939
const Pinetime::Controllers::Battery& batteryController;
4040
Pinetime::Controllers::BrightnessController& brightnessController;
4141
const Pinetime::Controllers::Ble& bleController;
42-
Pinetime::Drivers::WatchdogView& watchdog;
42+
const Pinetime::Drivers::Watchdog& watchdog;
4343
Pinetime::Controllers::MotionController& motionController;
4444
const Pinetime::Drivers::Cst816S& touchPanel;
4545

src/drivers/Watchdog.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,5 @@ namespace Pinetime {
2020
ResetReasons resetReason;
2121
ResetReasons ActualResetReason() const;
2222
};
23-
24-
class WatchdogView {
25-
public:
26-
WatchdogView(const Watchdog& watchdog) : watchdog {watchdog} {
27-
}
28-
29-
Watchdog::ResetReasons ResetReason() const {
30-
return watchdog.ResetReason();
31-
}
32-
33-
private:
34-
const Watchdog& watchdog;
35-
};
3623
}
3724
}

src/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ Pinetime::Controllers::MotorController motorController {};
106106

107107
Pinetime::Controllers::DateTime dateTimeController {settingsController};
108108
Pinetime::Drivers::Watchdog watchdog;
109-
Pinetime::Drivers::WatchdogView watchdogView(watchdog);
110109
Pinetime::Controllers::NotificationManager notificationManager;
111110
Pinetime::Controllers::MotionController motionController;
112111
Pinetime::Controllers::TimerController timerController;
@@ -121,7 +120,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
121120
batteryController,
122121
bleController,
123122
dateTimeController,
124-
watchdogView,
123+
watchdog,
125124
notificationManager,
126125
heartRateController,
127126
settingsController,

0 commit comments

Comments
 (0)