Added fallback to Basic Control menu when dimming timeout elapses, unless in Detailed Control or Clock
This commit is contained in:
parent
4bc1c79a6d
commit
5875a30064
|
@ -181,9 +181,20 @@ CScreenManager::checkUpdate()
|
|||
if(_DimTime) {
|
||||
long tDelta = millis() - _DimTime;
|
||||
if(tDelta > 0) {
|
||||
// time to dim the display
|
||||
// if(NVstore.getDimTime())
|
||||
_pDisplay->dim(true);
|
||||
_DimTime = 0;
|
||||
|
||||
// fall back to main menu
|
||||
selectTimerScreen(false);
|
||||
selectSetTimeScreen(false);
|
||||
selectSettingsScreen(false);
|
||||
// sticky screens are Detailed Control, Basic Control, or Clock.
|
||||
// otherwise return to Basic Control screen
|
||||
if(_currentScreen > 2) {
|
||||
_currentScreen = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -61,16 +61,17 @@ CSettingsScreen::show()
|
|||
|
||||
if(_nAdoptSettings == 1) {
|
||||
_display.clearDisplay();
|
||||
_display.writeFillRect(0, 0, 128, 20, WHITE);
|
||||
_printInverted(_display.xCentre(), 2, "Adopt LCD controller", true, eCentreJustify);
|
||||
_printInverted(_display.xCentre(), 11, "settings? ", true, eCentreJustify);
|
||||
_display.writeFillRect(0, 0, 128, 24, WHITE);
|
||||
_printInverted(_display.xCentre(), 4, "Adopt LCD controller", true, eCentreJustify);
|
||||
_printInverted(_display.xCentre(), 13, "settings? ", true, eCentreJustify);
|
||||
_printMenuText(_display.xCentre(), 35, "Press RIGHT to", false, eCentreJustify);
|
||||
_printMenuText(_display.xCentre(), 45, "inherit and save", false, eCentreJustify);
|
||||
}
|
||||
else if(_nAdoptSettings == 2) {
|
||||
_display.clearDisplay();
|
||||
_printInverted(_display.xCentre(), 2, " Cannot inherit knob ", true, eCentreJustify);
|
||||
_printInverted(_display.xCentre(), 11, " controller settings ", true, eCentreJustify);
|
||||
_display.writeFillRect(0, 0, 128, 24, WHITE);
|
||||
_printInverted(_display.xCentre(), 4, " Cannot inherit knob ", true, eCentreJustify);
|
||||
_printInverted(_display.xCentre(), 13, " controller settings ", true, eCentreJustify);
|
||||
_printMenuText(_display.xCentre(), 35, "Press any key", false, eCentreJustify);
|
||||
_printMenuText(_display.xCentre(), 45, "to abort", false, eCentreJustify);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue