diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-03-20 10:27:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 10:27:16 (GMT) |
| commit | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (patch) | |
| tree | 0549cf49f95f6142af862063f46750ea994a8941 /src/main.cpp | |
| 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/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 fe177d0..e7f5c03 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 "displayapp/DisplayApp.h" #include "displayapp/LittleVgl.h" #include "drivers/Spi.h" @@ -101,6 +102,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(); @@ -242,7 +245,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(); |
