Merge branch 'develop' of github.com:JF002/Pinetime into develop

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 4f8ed6a..fe177d0 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) {
@@ -232,7 +233,7 @@ void nimble_port_ll_task_func(void *args) {
   ble_ll_task(args);
 }
 }
-int countT2 = 0;
+
 int main(void) {
   logger.Init();
 
@@ -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();