Skip to content

Commit

Permalink
Merge pull request #161 from mark9064/clear-taps
Browse files Browse the repository at this point in the history
Update for Clear Taps PR
  • Loading branch information
NeroBurner authored Oct 28, 2024
2 parents 56a9673 + 6cd8962 commit 4590378
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion InfiniTime
Submodule InfiniTime updated 50 files
+0 −3 .gitmodules
+25 −4 README.md
+ doc/logo/watchface_collage.png
+3 −0 src/CMakeLists.txt
+88 −13 src/components/alarm/AlarmController.cpp
+32 −14 src/components/alarm/AlarmController.h
+5 −3 src/components/ble/DfuService.cpp
+2 −0 src/components/ble/MusicService.cpp
+1 −0 src/components/ble/MusicService.h
+8 −2 src/components/ble/NimbleController.cpp
+1 −1 src/components/ble/SimpleWeatherService.h
+20 −5 src/components/datetime/DateTimeController.cpp
+1 −1 src/components/heartrate/Ppg.cpp
+1 −1 src/components/heartrate/Ppg.h
+75 −45 src/displayapp/DisplayApp.cpp
+2 −2 src/displayapp/DisplayApp.h
+9 −0 src/displayapp/LittleVgl.cpp
+1 −0 src/displayapp/LittleVgl.h
+1 −0 src/displayapp/Messages.h
+14 −18 src/displayapp/screens/Alarm.cpp
+2 −1 src/displayapp/screens/Alarm.h
+2 −3 src/displayapp/screens/FlashLight.cpp
+2 −1 src/displayapp/screens/FlashLight.h
+4 −5 src/displayapp/screens/HeartRate.cpp
+2 −1 src/displayapp/screens/HeartRate.h
+3 −4 src/displayapp/screens/Metronome.cpp
+2 −1 src/displayapp/screens/Metronome.h
+8 −8 src/displayapp/screens/Notifications.cpp
+2 −1 src/displayapp/screens/Notifications.h
+3 −4 src/displayapp/screens/StopWatch.cpp
+2 −1 src/displayapp/screens/StopWatch.h
+1 −2 src/displayapp/screens/SystemInfo.cpp
+0 −1 src/displayapp/screens/SystemInfo.h
+1 −2 src/displayapp/screens/settings/SettingDisplay.cpp
+1 −2 src/displayapp/screens/settings/SettingDisplay.h
+1 −2 src/displayapp/screens/settings/SettingSetDateTime.cpp
+0 −1 src/displayapp/screens/settings/SettingSetDateTime.h
+1 −2 src/displayapp/screens/settings/SettingWatchFace.cpp
+0 −1 src/displayapp/screens/settings/SettingWatchFace.h
+31 −33 src/drivers/Hrs3300.cpp
+6 −4 src/drivers/Hrs3300.h
+1 −2 src/drivers/St7789.cpp
+2 −1 src/heartratetask/HeartRateTask.cpp
+0 −1 src/libs/QCBOR
+2 −2 src/main.cpp
+1 −1 src/systemtask/Messages.h
+100 −117 src/systemtask/SystemTask.cpp
+5 −9 src/systemtask/SystemTask.h
+27 −0 src/systemtask/WakeLock.cpp
+19 −0 src/systemtask/WakeLock.h
4 changes: 2 additions & 2 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -911,12 +911,12 @@ class Framework {
const bool right_click = (buttons & SDL_BUTTON_RMASK) != 0;
if (left_click) {
left_release_sent = false;
systemTask.OnTouchEvent();
systemTask.PushMessage(Pinetime::System::Messages::OnTouchEvent);
return;
} else {
if (!left_release_sent) {
left_release_sent = true;
systemTask.OnTouchEvent();
systemTask.PushMessage(Pinetime::System::Messages::OnTouchEvent);
return;
}
}
Expand Down

0 comments on commit 4590378

Please sign in to comment.