diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-08-28 15:09:16 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-08-28 15:09:16 +0200 |
commit | f895da8634f2843b9c2da330f07c94d2da8b4ec1 (patch) | |
tree | da7aeddc1188e6a6b96be01c7b19552c54659988 /src/systemtask/SystemTask.cpp | |
parent | 969de9a8bccfa97da29de2eac61be9325dd2fdaa (diff) | |
parent | 45e7638fc23c260fa743a04e78873b22189e0597 (diff) |
Merge branch 'Riksu9000-twimaster_rework' into develop
Diffstat (limited to 'src/systemtask/SystemTask.cpp')
-rw-r--r-- | src/systemtask/SystemTask.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index c54f33ef..08e21999 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -220,7 +220,6 @@ void SystemTask::Work() { break; case Messages::GoToRunning: spi.Wakeup(); - twiMaster.Wakeup(); // Double Tap needs the touch screen to be in normal mode if (!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) { @@ -241,16 +240,12 @@ void SystemTask::Work() { isDimmed = false; break; case Messages::TouchWakeUp: { - twiMaster.Wakeup(); - touchHandler.GetNewTouchInfo(); - auto gesture = touchHandler.GestureGet(); - if ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap && - settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) || - (gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap && - settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap))) { + auto touchInfo = touchPanel.GetTouchInfo(); + if (touchInfo.isTouch 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(); - } else { - twiMaster.Sleep(); } } break; case Messages::GoToSleep: @@ -320,7 +315,6 @@ void SystemTask::Work() { if (!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) { touchPanel.Sleep(); } - twiMaster.Sleep(); isSleeping = true; isGoingToSleep = false; @@ -372,17 +366,12 @@ void SystemTask::UpdateMotion() { if (isSleeping && !settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist)) return; - if (isSleeping) - twiMaster.Wakeup(); - if (stepCounterMustBeReset) { motionSensor.ResetStepCounter(); stepCounterMustBeReset = false; } auto motionValues = motionSensor.Process(); - if (isSleeping) - twiMaster.Sleep(); motionController.IsSensorOk(motionSensor.IsOk()); motionController.Update(motionValues.x, motionValues.y, motionValues.z, motionValues.steps); |