Update standby in AM via long-press BAND
This commit is contained in:
+41
-46
@@ -933,61 +933,56 @@ void ScreensaverInterrupt()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void BANDBUTTONPress() {
|
void BANDBUTTONPress() {
|
||||||
if (afscreen) {
|
if (!power) {
|
||||||
BuildAdvancedRDS();
|
if (screensavertriggered) WakeToSleep(REVERSE);
|
||||||
} else {
|
} else {
|
||||||
unsigned long counterold = millis();
|
if (afscreen) {
|
||||||
unsigned long counter = millis();
|
BuildAdvancedRDS();
|
||||||
if (menu == false && power) {
|
} else {
|
||||||
while (digitalRead(BANDBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
|
unsigned long counterold = millis();
|
||||||
|
unsigned long counter = millis();
|
||||||
|
if (!menu && power) {
|
||||||
|
while (digitalRead(BANDBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
|
||||||
|
|
||||||
if (counter - counterold < 1000) {
|
if (counter - counterold < 1000) {
|
||||||
if (screensavertriggered) {
|
if (screensavertriggered) {
|
||||||
WakeToSleep(REVERSE);
|
WakeToSleep(REVERSE);
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if (advancedRDS) {
|
|
||||||
BuildDisplay();
|
|
||||||
ScreensaverTimerReopen();
|
|
||||||
} else {
|
|
||||||
if (tunemode != TUNE_MEM) {
|
|
||||||
if (band == BAND_FM) {
|
|
||||||
band = BAND_LW;
|
|
||||||
if (stepsize > 3) stepsize = 3;
|
|
||||||
}
|
|
||||||
else if (band == BAND_LW) band = BAND_MW;
|
|
||||||
else if (band == BAND_MW) band = BAND_SW;
|
|
||||||
else if (band == BAND_SW) band = BAND_FM;
|
|
||||||
StoreFrequency();
|
|
||||||
SelectBand();
|
|
||||||
}
|
}
|
||||||
ScreensaverTimerRestart();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (screensavertriggered) {
|
|
||||||
WakeToSleep(REVERSE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (band == BAND_FM) {
|
if (advancedRDS) {
|
||||||
if (advancedRDS && !seek) BuildAFScreen(); else BuildAdvancedRDS();
|
BuildDisplay();
|
||||||
|
ScreensaverTimerReopen();
|
||||||
|
} else {
|
||||||
|
if (tunemode != TUNE_MEM) {
|
||||||
|
if (band == BAND_FM) {
|
||||||
|
band = BAND_LW;
|
||||||
|
if (stepsize > 3) stepsize = 3;
|
||||||
|
}
|
||||||
|
else if (band == BAND_LW) band = BAND_MW;
|
||||||
|
else if (band == BAND_MW) band = BAND_SW;
|
||||||
|
else if (band == BAND_SW) band = BAND_FM;
|
||||||
|
StoreFrequency();
|
||||||
|
SelectBand();
|
||||||
|
}
|
||||||
|
ScreensaverTimerRestart();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (screensavertriggered) {
|
||||||
|
WakeToSleep(REVERSE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (band == BAND_FM) {
|
||||||
|
if (advancedRDS && !seek) BuildAFScreen(); else BuildAdvancedRDS();
|
||||||
|
} else {
|
||||||
|
WakeToSleep(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while (digitalRead(BANDBUTTON) == LOW) delay(50);
|
while (digitalRead(BANDBUTTON) == LOW) delay(50);
|
||||||
delay(100);
|
delay(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wake after screensaver triggered here
|
|
||||||
if (power == false) {
|
|
||||||
while (digitalRead(BANDBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
|
|
||||||
|
|
||||||
if (counter - counterold < 1000) {
|
|
||||||
if (screensavertriggered) WakeToSleep(REVERSE);
|
|
||||||
} else {
|
|
||||||
if (screensavertriggered) WakeToSleep(REVERSE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user