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

Remove backup brightness feature (#1180)

Browse Source 
This feature is not needed and is probably more likely to cause issues. It's better to just use brightnessController.Set(settingsController.GetBrightness());
This commit is contained in:
Riku Isokoski
2022-06-18 12:54:41 +03:00
committed by GitHub
parent 9b775c6a91
commit 95ff285991
4 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/displayapp/DisplayApp.cpp
View File

@@ -129,6 +129,11 @@ void DisplayApp::InitHw() {
}
void DisplayApp::Refresh() {
auto LoadPreviousScreen = [this]() {
brightnessController.Set(settingsController.GetBrightness());
LoadApp(returnToApp, returnDirection);
};
TickType_t queueTimeout;
switch (state) {
case States::Idle:
@@ -136,7 +141,7 @@ void DisplayApp::Refresh() {
break;
case States::Running:
if (!currentScreen->IsRunning()) {
LoadApp(returnToApp, returnDirection);
LoadPreviousScreen();
}
queueTimeout = lv_task_handler();
break;
@@ -149,12 +154,10 @@ void DisplayApp::Refresh() {
if (xQueueReceive(msgQueue, &msg, queueTimeout)) {
switch (msg) {
case Messages::DimScreen:
// Backup brightness is the brightness to return to after dimming or sleeping
brightnessController.Backup();
brightnessController.Set(Controllers::BrightnessController::Levels::Low);
break;
case Messages::RestoreBrightness:
brightnessController.Restore();
brightnessController.Set(settingsController.GetBrightness());
break;
case Messages::GoToSleep:
while (brightnessController.Level() != Controllers::BrightnessController::Levels::Off) {
@@ -165,7 +168,7 @@ void DisplayApp::Refresh() {
state = States::Idle;
break;
case Messages::GoToRunning:
brightnessController.Restore();
brightnessController.Set(settingsController.GetBrightness());
state = States::Running;
break;
case Messages::UpdateTimeOut:
@@ -224,9 +227,7 @@ void DisplayApp::Refresh() {
break;
}
} else if (returnTouchEvent == gesture) {
LoadApp(returnToApp, returnDirection);
brightnessController.Set(settingsController.GetBrightness());
brightnessController.Backup();
LoadPreviousScreen();
}
} else {
touchHandler.CancelTap();
@@ -237,9 +238,7 @@ void DisplayApp::Refresh() {
if (currentApp == Apps::Clock) {
PushMessageToSystemTask(System::Messages::GoToSleep);
} else {
LoadApp(returnToApp, returnDirection);
brightnessController.Set(settingsController.GetBrightness());
brightnessController.Backup();
LoadPreviousScreen();
}
}
break;