diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-03-20 11:27:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 11:27:16 +0100 |
| commit | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (patch) | |
| tree | 0549cf49f95f6142af862063f46750ea994a8941 /src/systemtask | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
| parent | 282e34dca14ddc799b9511643e50a4f9023003ed (diff) | |
Merge pull request #217 from joaquimorg/MultiFaceClock
Multi face support, analog clock, 12/24 config
Diffstat (limited to 'src/systemtask')
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 8 | ||||
| -rw-r--r-- | src/systemtask/SystemTask.h | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 6e6360a4..2f622b57 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -41,13 +41,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 c650d085..055effeb 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -13,6 +13,7 @@ #include "components/ble/NimbleController.h" #include "components/ble/NotificationManager.h" #include "components/motor/MotorController.h" +#include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" #include "drivers/Watchdog.h" @@ -39,7 +40,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(); @@ -77,6 +79,7 @@ namespace Pinetime { Pinetime::Controllers::NotificationManager notificationManager; Pinetime::Controllers::MotorController& motorController; Pinetime::Drivers::Hrs3300& heartRateSensor; + Pinetime::Controllers::Settings& settingsController; Pinetime::Controllers::NimbleController nimbleController; static constexpr uint8_t pinSpiSck = 2; |