From 3a0ee34be520d18de723601fa5b4f4c55dae88e4 Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Sun, 26 Feb 2023 22:52:41 +0100
Subject: [PATCH] main: updated to changed DisplayApp and SystemTask
 constructors

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
---
 InfiniTime | 2 +-
 main.cpp   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/InfiniTime b/InfiniTime
index 5ab255b..ce2277c 160000
--- a/InfiniTime
+++ b/InfiniTime
@@ -1 +1 @@
-Subproject commit 5ab255b26b4f23ca4b6fab2a660f8cf55fcda48b
+Subproject commit ce2277cbcac0f28b27c1483fba09921f43d590cd
diff --git a/main.cpp b/main.cpp
index f4d1fe1..fec0758 100644
--- a/main.cpp
+++ b/main.cpp
@@ -349,7 +349,6 @@ Pinetime::Controllers::MotorController motorController {};
 
 Pinetime::Controllers::DateTime dateTimeController {settingsController};
 Pinetime::Drivers::Watchdog watchdog;
-Pinetime::Drivers::WatchdogView watchdogView(watchdog);
 Pinetime::Controllers::NotificationManager notificationManager;
 Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::TimerController timerController;
@@ -359,12 +358,11 @@ Pinetime::Controllers::ButtonHandler buttonHandler;
 Pinetime::Controllers::BrightnessController brightnessController {};
 
 Pinetime::Applications::DisplayApp displayApp(lcd,
-                                              lvgl,
                                               touchPanel,
                                               batteryController,
                                               bleController,
                                               dateTimeController,
-                                              watchdogView,
+                                              watchdog,
                                               notificationManager,
                                               heartRateController,
                                               settingsController,
@@ -377,11 +375,9 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               fs);
 
 Pinetime::System::SystemTask systemTask(spi,
-                                        lcd,
                                         spiNorFlash,
                                         twiMaster,
                                         touchPanel,
-                                        lvgl,
                                         batteryController,
                                         bleController,
                                         dateTimeController,