diff options
| author | JF <jf@codingfield.com> | 2021-03-21 17:15:07 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-03-21 17:15:07 (GMT) |
| commit | 24d3eea4fba05d774ace794eb8c9b21b8f2aa8c6 (patch) | |
| tree | 500b57847eb84f73fa62e7500e5a24d1a6d2f4cb /src/systemtask | |
| parent | 5cd4b36d6bbf22095e0ff54aa3773febc6e1f22e (diff) | |
| parent | 9f9d0eb5df8ff86b9cd1e095afa3159094dde53c (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/systemtask')
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 8 | ||||
| -rw-r--r-- | src/systemtask/SystemTask.h | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index a4f2b14..19a416b 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -40,13 +40,15 @@ SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, Controllers::Battery &batteryController, Controllers::Ble &bleController, Controllers::DateTime &dateTimeController, Pinetime::Controllers::MotorController& motorController, - Pinetime::Drivers::Hrs3300& heartRateSensor) : + Pinetime::Drivers::Hrs3300& heartRateSensor, + Controllers::Settings &settingsController) : spi{spi}, lcd{lcd}, spiNorFlash{spiNorFlash}, twiMaster{twiMaster}, touchPanel{touchPanel}, lvgl{lvgl}, batteryController{batteryController}, heartRateController{*this}, bleController{bleController}, dateTimeController{dateTimeController}, watchdog{}, watchdogView{watchdog}, motorController{motorController}, heartRateSensor{heartRateSensor}, + settingsController{settingsController}, nimbleController(*this, bleController,dateTimeController, notificationManager, batteryController, spiNorFlash, heartRateController) { systemTasksMsgQueue = xQueueCreate(10, 1); } @@ -81,10 +83,12 @@ void SystemTask::Work() { batteryController.Init(); motorController.Init(); + settingsController.Init(); + displayApp.reset(new Pinetime::Applications::DisplayApp(lcd, lvgl, touchPanel, batteryController, bleController, dateTimeController, watchdogView, *this, notificationManager, - heartRateController)); + heartRateController, settingsController)); displayApp->Start(); batteryController.Update(); diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index eadbc72..cc69373 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -7,6 +7,7 @@ #include <timers.h> #include <heartratetask/HeartRateTask.h> #include <components/heartrate/HeartRateController.h> +#include <components/settings/Settings.h> #include "SystemMonitor.h" #include "components/battery/BatteryController.h" @@ -17,6 +18,7 @@ #include "displayapp/DisplayAppRecovery.h" #include "displayapp/DummyLittleVgl.h" #else +#include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" #include "displayapp/LittleVgl.h" #endif @@ -46,7 +48,8 @@ namespace Pinetime { Controllers::Battery &batteryController, Controllers::Ble &bleController, Controllers::DateTime &dateTimeController, Pinetime::Controllers::MotorController& motorController, - Pinetime::Drivers::Hrs3300& heartRateSensor); + Pinetime::Drivers::Hrs3300& heartRateSensor, + Controllers::Settings &settingsController); void Start(); @@ -84,6 +87,7 @@ namespace Pinetime { Pinetime::Controllers::NotificationManager notificationManager; Pinetime::Controllers::MotorController& motorController; Pinetime::Drivers::Hrs3300& heartRateSensor; + Pinetime::Controllers::Settings& settingsController; Pinetime::Controllers::NimbleController nimbleController; Controllers::BrightnessController brightnessController; |