Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add StopWatchController #75

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add StopWatchController #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion InfiniTime
Open in desktop
Submodule InfiniTime updated 12 files
+3 −0 src/CMakeLists.txt
+101 −0 src/components/stopwatch/StopWatchController.cpp
+65 −0 src/components/stopwatch/StopWatchController.h
+3 −1 src/displayapp/DisplayApp.cpp
+3 −0 src/displayapp/DisplayApp.h
+1 −0 src/displayapp/DisplayAppRecovery.cpp
+2 −0 src/displayapp/DisplayAppRecovery.h
+64 −42 src/displayapp/screens/StopWatch.cpp
+8 −12 src/displayapp/screens/StopWatch.h
+4 −0 src/main.cpp
+2 −0 src/systemtask/SystemTask.cpp
+3 −0 src/systemtask/SystemTask.h
3 changes: 3 additions & 0 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand All @@ -359,6 +360,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
motionController,
timerController,
alarmController,
stopWatchController,
brightnessController,
touchHandler,
fs);
Expand All @@ -374,6 +376,7 @@ Pinetime::System::SystemTask systemTask(spi,
dateTimeController,
timerController,
alarmController,
stopWatchController,
watchdog,
notificationManager,
motorController,
Expand Down