will/InfiniSim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: updated to changed DisplayApp and SystemTask constructors

Browse Source 
The constructors got cleaned up and the WatchdogView got replaced by a
const reference to the Watchdog object.

Update develop branch to the `infineat: Create colors at compile time`
commit, where those changes are needed
This commit is contained in:
Reinhold Gschweicher 2023-02-26 22:52:41 +01:00
parent 36c69bbc2e
commit 3a0ee34be5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InfiniTime

@ -1 +1 @@
Subproject commit 5ab255b26b4f23ca4b6fab2a660f8cf55fcda48b Subproject commit ce2277cbcac0f28b27c1483fba09921f43d590cd

6
main.cpp
View File

@ -349,7 +349,6 @@ Pinetime::Controllers::MotorController motorController {};
Pinetime::Controllers::DateTime dateTimeController {settingsController}; Pinetime::Controllers::DateTime dateTimeController {settingsController};
Pinetime::Drivers::Watchdog watchdog; Pinetime::Drivers::Watchdog watchdog;
Pinetime::Drivers::WatchdogView watchdogView(watchdog);
Pinetime::Controllers::NotificationManager notificationManager; Pinetime::Controllers::NotificationManager notificationManager;
Pinetime::Controllers::MotionController motionController; Pinetime::Controllers::MotionController motionController;
Pinetime::Controllers::TimerController timerController; Pinetime::Controllers::TimerController timerController;
@ -359,12 +358,11 @@ Pinetime::Controllers::ButtonHandler buttonHandler;
Pinetime::Controllers::BrightnessController brightnessController {}; Pinetime::Controllers::BrightnessController brightnessController {};
Pinetime::Applications::DisplayApp displayApp(lcd, Pinetime::Applications::DisplayApp displayApp(lcd,
lvgl,
touchPanel, touchPanel,
batteryController, batteryController,
bleController, bleController,
dateTimeController, dateTimeController,
watchdogView, watchdog,
notificationManager, notificationManager,
heartRateController, heartRateController,
settingsController, settingsController,
@ -377,11 +375,9 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
fs); fs);
Pinetime::System::SystemTask systemTask(spi, Pinetime::System::SystemTask systemTask(spi,
lcd,
spiNorFlash, spiNorFlash,
twiMaster, twiMaster,
touchPanel, touchPanel,
lvgl,
batteryController, batteryController,
bleController, bleController,
dateTimeController, dateTimeController,