CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into timer_battery_reading

Browse Source
This commit is contained in:
Riku Isokoski
2021-08-30 10:15:19 +03:00
parent 085c9ab2e1 6c023785e5
commit 21d37d1e23
80 changed files with 686 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/systemtask/SystemTask.cpp
View File

@@ -240,12 +240,14 @@ void SystemTask::Work() {
isDimmed = false;
break;
case Messages::TouchWakeUp: {
auto touchInfo = touchPanel.GetTouchInfo();
if (touchInfo.touching and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
(touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
GoToRunning();
if(touchHandler.GetNewTouchInfo()) {
auto gesture = touchHandler.GestureGet();
if (gesture != Pinetime::Drivers::Cst816S::Gestures::None and ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
(gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
GoToRunning();
}
}
} break;
case Messages::GoToSleep: