Skip to content

Restore the termination guarantee in the sleep brightness step-down #2468

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

Open
fluffyspace wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

Restore the termination guarantee in the sleep brightness step-down #2468

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
12 changes: 10 additions & 2 deletions src/displayapp/DisplayApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,15 @@ void DisplayApp::Refresh() {
if (state != States::Running || !systemTask->IsSleeping()) {
break;
}
while (brightnessController.Level() != Controllers::BrightnessController::Levels::Low) {
// Levels are ordered Off, AlwaysOn, Low, Medium, High and Lower() is a no-op at Off
// and AlwaysOn, so a plain "until the level is Low" loop cannot terminate if this
// handler is ever entered at one of those two levels. Step down only from above Low,
// then set the level outright.
while (brightnessController.Level() > Controllers::BrightnessController::Levels::Low) {
brightnessController.Lower();
vTaskDelay(100);
}
brightnessController.Set(Controllers::BrightnessController::Levels::Low);
// Turn brightness down (or set to AlwaysOn mode)
if (msg == Messages::GoToAOD) {
brightnessController.Set(Controllers::BrightnessController::Levels::AlwaysOn);
Expand All @@ -324,7 +329,10 @@ void DisplayApp::Refresh() {
currentApp == Apps::Settings) {
LoadScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
// Wait for the clock app to load before moving on.
while (!lv_task_handler()) {
// Bounded for the same reason as the brightness loop above: if lv_task_handler()
// never reports work done, spinning here wedges the display task permanently.
uint16_t attempts = 0;
while (!lv_task_handler() && ++attempts < 1000) {
};
}
// Clear any ongoing touch pressed events
Expand Down
Loading