diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-03-20 11:41:49 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-03-20 11:41:49 +0100 |
commit | 405c85c160b0d72407498a25555677d484b822f1 (patch) | |
tree | 71b22af329f7b5ee7a6f37ddca4c738f0e379593 /src/main.cpp | |
parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
parent | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (diff) |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
# Conflicts:
# src/main.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 03cb1687..b29aac71 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,6 +32,7 @@ #include "components/ble/NotificationManager.h" #include "components/motor/MotorController.h" #include "components/datetime/DateTimeController.h" +#include "components/settings/Settings.h" #include "drivers/Spi.h" #include "drivers/SpiMaster.h" #include "drivers/SpiNorFlash.h" @@ -110,6 +111,8 @@ std::unique_ptr<Pinetime::System::SystemTask> systemTask; Pinetime::Controllers::MotorController motorController; +Pinetime::Controllers::Settings settingsController; + void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { if(pin == pinTouchIrq) { systemTask->OnTouchEvent(); @@ -252,7 +255,7 @@ int main(void) { debounceTimer = xTimerCreate ("debounceTimer", 200, pdFALSE, (void *) 0, DebounceTimerCallback); systemTask.reset(new Pinetime::System::SystemTask(spi, lcd, spiNorFlash, twiMaster, touchPanel, lvgl, batteryController, bleController, - dateTimeController, motorController, heartRateSensor)); + dateTimeController, motorController, heartRateSensor, settingsController)); systemTask->Start(); nimble_port_init(); |