diff options
author | Joaquim <joaquim.org@gmail.com> | 2021-02-24 19:40:24 +0000 |
---|---|---|
committer | Joaquim <joaquim.org@gmail.com> | 2021-02-24 19:40:24 +0000 |
commit | 8c53d0b70baa03c2b07360444a7cd0ad99bb8381 (patch) | |
tree | 52585926f2abc810b2b93475dfb2580e6ea19f85 /src/displayapp/DisplayApp.cpp | |
parent | c18f4e5811dbd388e3b4acc29b1fab68279ec405 (diff) |
Multi face support, analog clock, 12/24 config
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r-- | src/displayapp/DisplayApp.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 6e3fd0bf..81afd207 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -31,7 +31,8 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog, System::SystemTask &systemTask, Pinetime::Controllers::NotificationManager& notificationManager, - Pinetime::Controllers::HeartRateController& heartRateController) : + Pinetime::Controllers::HeartRateController& heartRateController, + Controllers::Settings &settingsController) : lcd{lcd}, lvgl{lvgl}, batteryController{batteryController}, @@ -39,10 +40,11 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver dateTimeController{dateTimeController}, watchdog{watchdog}, touchPanel{touchPanel}, - currentScreen{new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, heartRateController) }, + currentScreen{new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, settingsController, heartRateController) }, systemTask{systemTask}, notificationManager{notificationManager}, - heartRateController{heartRateController} { + heartRateController{heartRateController}, + settingsController{settingsController} { msgQueue = xQueueCreate(queueSize, itemSize); onClockApp = true; } @@ -194,9 +196,9 @@ void DisplayApp::RunningState() { onClockApp = false; switch(nextApp) { case Apps::None: - case Apps::Launcher: currentScreen.reset(new Screens::ApplicationList(this)); break; + case Apps::Launcher: currentScreen.reset(new Screens::ApplicationList(this, settingsController)); break; case Apps::Clock: - currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, heartRateController)); + currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, settingsController, heartRateController)); onClockApp = true; break; case Apps::SysInfo: currentScreen.reset(new Screens::SystemInfo(this, dateTimeController, batteryController, brightnessController, bleController, watchdog)); break; |