diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-08-28 15:06:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-28 15:06:03 +0200 |
| commit | 969de9a8bccfa97da29de2eac61be9325dd2fdaa (patch) | |
| tree | 820a3bbe74993ff6ce6b7f430d187a397a46f363 /src/main.cpp | |
| parent | df8ea7fe523bb9ec0ac3e24f0b1bebe5743d90cc (diff) | |
| parent | 85c99797dad39348976d92ecf935536f362ee2c5 (diff) | |
Merge pull request #492 from Riksu9000/new_touch_handler
New touch handler
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index d301be67..768389e3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,6 +44,7 @@ #include "drivers/TwiMaster.h" #include "drivers/Cst816s.h" #include "systemtask/SystemTask.h" +#include "touchhandler/TouchHandler.h" #if NRF_LOG_ENABLED #include "logging/NrfLogger.h" @@ -119,6 +120,7 @@ Pinetime::Drivers::WatchdogView watchdogView(watchdog); Pinetime::Controllers::NotificationManager notificationManager; Pinetime::Controllers::MotionController motionController; Pinetime::Controllers::TimerController timerController; +Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl); Pinetime::Controllers::FS fs {spiNorFlash}; Pinetime::Controllers::Settings settingsController {fs}; @@ -137,7 +139,8 @@ Pinetime::Applications::DisplayApp displayApp(lcd, settingsController, motorController, motionController, - timerController); + timerController, + touchHandler); Pinetime::System::SystemTask systemTask(spi, lcd, @@ -159,7 +162,8 @@ Pinetime::System::SystemTask systemTask(spi, heartRateController, displayApp, heartRateApp, - fs); + fs, + touchHandler); void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { if (pin == pinTouchIrq) { @@ -324,6 +328,7 @@ int main(void) { lvgl.Init(); systemTask.Start(); + nimble_port_init(); vTaskStartScheduler(); |