diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 19:16:21 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 19:16:21 (GMT) |
| commit | 15b3b8e282dd5b2132b0095716cd9d88740d4579 (patch) | |
| tree | c26870103f8baaa933399cfb86cca25aa7e60d8b /src/main.cpp | |
| parent | 9ac4be8b759bb2cedeb999ce5e87d983261beded (diff) | |
| parent | 57b4c3f0edc6acfa31bd2160abdcd6091920ba63 (diff) | |
Merge branch 'develop' into motion-sensor
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/DisplayApp.h
# src/displayapp/lv_pinetime_theme.c
# src/displayapp/screens/ApplicationList.cpp
# src/drivers/TwiMaster.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6cca9c8..9470bdb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -112,9 +112,9 @@ void ble_manager_set_ble_disconnection_callback(void (*disconnection)()); static constexpr uint8_t pinTouchIrq = 28; std::unique_ptr<Pinetime::System::SystemTask> systemTask; -Pinetime::Controllers::MotorController motorController; +Pinetime::Controllers::Settings settingsController{spiNorFlash}; -Pinetime::Controllers::Settings settingsController; +Pinetime::Controllers::MotorController motorController{settingsController}; void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { if(pin == pinTouchIrq) { |