From 90faf5a56d7bfac2181f729bc5fb18c9dcdfded1 Mon Sep 17 00:00:00 2001 From: pptime02 <108622882+pptime02@users.noreply.github.com> Date: Tue, 1 Nov 2022 18:23:52 +0100 Subject: [PATCH] Add StopWatchController StopWatchController was introduced with https://github.com/InfiniTimeOrg/InfiniTime/pull/1410 --- CMakeLists.txt | 2 ++ InfiniTime | 2 +- main.cpp | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24c6c33..1983e4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,6 +210,8 @@ target_sources(infinisim PUBLIC ${InfiniTime_DIR}/src/components/fs/FS.cpp ${InfiniTime_DIR}/src/components/motor/MotorController.h ${InfiniTime_DIR}/src/components/motor/MotorController.cpp + ${InfiniTime_DIR}/src/components/stopwatch/StopWatchController.h + ${InfiniTime_DIR}/src/components/stopwatch/StopWatchController.cpp ${InfiniTime_DIR}/src/components/timer/TimerController.h ${InfiniTime_DIR}/src/components/timer/TimerController.cpp ${InfiniTime_DIR}/src/drivers/PinMap.h diff --git a/InfiniTime b/InfiniTime index b56c5f2..fd2e21b 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit b56c5f25f077d17b23677cdd0d4dc247ce7c421f +Subproject commit fd2e21b3a2bdb186e1590485b488985de152ce41 diff --git a/main.cpp b/main.cpp index ce04fdd..59e6d2f 100644 --- a/main.cpp +++ b/main.cpp @@ -341,6 +341,7 @@ Pinetime::Controllers::NotificationManager notificationManager; Pinetime::Controllers::MotionController motionController; Pinetime::Controllers::TimerController timerController; Pinetime::Controllers::AlarmController alarmController {dateTimeController}; +Pinetime::Controllers::StopWatchController stopWatchController; Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl); Pinetime::Controllers::ButtonHandler buttonHandler; Pinetime::Controllers::BrightnessController brightnessController {}; @@ -359,6 +360,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd, motionController, timerController, alarmController, + stopWatchController, brightnessController, touchHandler, fs); @@ -374,6 +376,7 @@ Pinetime::System::SystemTask systemTask(spi, dateTimeController, timerController, alarmController, + stopWatchController, watchdog, notificationManager, motorController,