aod: integrate with display timeout

This commit is contained in:
John Crawford 2023-10-01 10:38:45 -06:00 committed by JF
parent 3dca742b65
commit 85a2181b64
3 changed files with 28 additions and 17 deletions

View file

@ -236,7 +236,7 @@ void SystemTask::Work() {
break;
}
case Messages::GoToSleep:
if (doNotGoToSleep or settingsController.GetAlwaysOnDisplay()) {
if (doNotGoToSleep) {
break;
}
state = SystemTaskState::GoingToSleep; // Already set in PushMessage()
@ -512,7 +512,7 @@ void SystemTask::OnTouchEvent() {
}
void SystemTask::PushMessage(System::Messages msg) {
if (msg == Messages::GoToSleep && !doNotGoToSleep && !settingsController.GetAlwaysOnDisplay()) {
if (msg == Messages::GoToSleep && !doNotGoToSleep) {
state = SystemTaskState::GoingToSleep;
}