diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-02-14 13:26:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 13:26:49 (GMT) |
| commit | 0ad10a381772f97cb227fba9e1121a833c5bd026 (patch) | |
| tree | 6883f02d33cc22f539c73728bcd732cd5254c8c7 /src/main.cpp | |
| parent | 6c03c970056c2aee833bfd195dcd9ca28520d37b (diff) | |
| parent | 97a1c4b3d7be04ddb24fea096add41b44629a5f9 (diff) | |
Merge branch 'develop' into Hrs3300_SetGain_remove_warnings
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4f8ed6a..8644ed4 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,7 +99,7 @@ void ble_manager_set_ble_disconnection_callback(void (*disconnection)()); static constexpr uint8_t pinTouchIrq = 28; std::unique_ptr<Pinetime::System::SystemTask> systemTask; -Pinetime::Controllers::NotificationManager notificationManager; +Pinetime::Controllers::MotorController motorController; void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { if(pin == pinTouchIrq) { @@ -241,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, notificationManager, heartRateSensor)); + dateTimeController, motorController, heartRateSensor)); systemTask->Start(); nimble_port_init(); |
