diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-02-13 10:23:20 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-02-13 10:23:20 (GMT) |
| commit | e332be0d7c1eabda8c296d38b57bfcd47a456772 (patch) | |
| tree | 7d7586810c062d8fac37f16f208f6da77757a3ba /src/main.cpp | |
| parent | d967efa19710f85cee846c59adbbe07d2a2189dc (diff) | |
| parent | 87d882b151acc7ef60fdb1a957649faf39e737c1 (diff) | |
Merge branch 'mruss77-statusBarTimeFormat' into develop
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 53f78ce..81d297f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -101,7 +101,11 @@ Pinetime::Controllers::Ble bleController; Pinetime::Controllers::HeartRateController heartRateController; Pinetime::Applications::HeartRateTask heartRateApp(heartRateSensor, heartRateController); -Pinetime::Controllers::DateTime dateTimeController; +Pinetime::Controllers::FS fs {spiNorFlash}; +Pinetime::Controllers::Settings settingsController {fs}; +Pinetime::Controllers::MotorController motorController {}; + +Pinetime::Controllers::DateTime dateTimeController {settingsController}; Pinetime::Drivers::Watchdog watchdog; Pinetime::Drivers::WatchdogView watchdogView(watchdog); Pinetime::Controllers::NotificationManager notificationManager; @@ -111,10 +115,6 @@ Pinetime::Controllers::AlarmController alarmController {dateTimeController}; Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl); Pinetime::Controllers::ButtonHandler buttonHandler; -Pinetime::Controllers::FS fs {spiNorFlash}; -Pinetime::Controllers::Settings settingsController {fs}; -Pinetime::Controllers::MotorController motorController {}; - Pinetime::Applications::DisplayApp displayApp(lcd, lvgl, touchPanel, |
