diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:46 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:46 +0100 |
commit | 07a0d7cf2de8244e481df697ebd9c85eb413163f (patch) | |
tree | 983bd7fb1780c433aa12331377e67ced9b46b3a8 /src/main.cpp | |
parent | 4c3803450e33e321dd2f90bdf62b9abe99f1e491 (diff) | |
parent | 5fdfb2112e2f6413c4d01c74dd04492e27a6d406 (diff) |
Merge branch 'jlukanc1-upstream-dev' into develop
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 4aaf23c0..8644ed48 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,6 +30,7 @@ #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/ble/NotificationManager.h" +#include "components/motor/MotorController.h" #include "components/datetime/DateTimeController.h" #include "displayapp/DisplayApp.h" #include "displayapp/LittleVgl.h" @@ -98,6 +99,8 @@ 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; + void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { if(pin == pinTouchIrq) { systemTask->OnTouchEvent(); @@ -239,7 +242,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, heartRateSensor)); + dateTimeController, motorController, heartRateSensor)); systemTask->Start(); nimble_port_init(); |