Fixed regression

This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-30 15:28:02 +02:00
parent 0ffb06be21
commit fd9a552ae4
+16 -4
View File
@@ -1619,6 +1619,7 @@ void BANDBUTTONPress() {
BuildAdvancedRDS(); BuildAdvancedRDS();
} else if (advancedRDS) { } else if (advancedRDS) {
BuildDisplay(); BuildDisplay();
SelectBand();
ScreensaverTimerReopen(); ScreensaverTimerReopen();
} else { } else {
if (tunemode != TUNE_MEM) { if (tunemode != TUNE_MEM) {
@@ -2245,6 +2246,7 @@ void ModeButtonPress() {
if (!usesquelch) radio.setUnMute(); if (!usesquelch) radio.setUnMute();
if (advancedRDS) { if (advancedRDS) {
BuildDisplay(); BuildDisplay();
SelectBand();
ScreensaverTimerReopen(); ScreensaverTimerReopen();
} else if (afscreen) { } else if (afscreen) {
if (afpagenr == 1) afpagenr = 2; else if (afpagenr == 2 && afpage) afpagenr = 3; else afpagenr = 1; if (afpagenr == 1) afpagenr = 2; else if (afpagenr == 2 && afpage) afpagenr = 3; else afpagenr = 1;
@@ -2430,7 +2432,10 @@ void ButtonPress() {
cancelDXScan(); cancelDXScan();
} else { } else {
if (!usesquelch) radio.setUnMute(); if (!usesquelch) radio.setUnMute();
if (advancedRDS) BuildDisplay(); if (advancedRDS) {
BuildDisplay();
SelectBand();
}
if (!menu) { if (!menu) {
if (tunemode == TUNE_MEM) { if (tunemode == TUNE_MEM) {
if (!memorystore) { if (!memorystore) {
@@ -4094,11 +4099,17 @@ void MuteScreen(bool setting) {
tft.writecommand(0x11); tft.writecommand(0x11);
analogWrite(CONTRASTPIN, ContrastSet * 2 + 27); analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
if (band < BAND_GAP) { if (band < BAND_GAP) {
if (afscreen) BuildAFScreen(); if (afscreen) {
else if (advancedRDS) BuildAdvancedRDS(); BuildAFScreen();
else BuildDisplay(); } else if (advancedRDS) {
BuildAdvancedRDS();
} else { } else {
BuildDisplay(); BuildDisplay();
SelectBand();
}
} else {
BuildDisplay();
SelectBand();
} }
setupmode = false; setupmode = false;
} else if (setting && !screenmute) { } else if (setting && !screenmute) {
@@ -4442,6 +4453,7 @@ void endMenu() {
if (USBmode) Serial.begin(19200); else Serial.begin(115200); if (USBmode) Serial.begin(19200); else Serial.begin(115200);
BuildDisplay(); BuildDisplay();
SelectBand();
} }
void startFMDXScan() { void startFMDXScan() {