From 34585e17bc7fcd90619625bfe03159c0b9506dc1 Mon Sep 17 00:00:00 2001
From: ohmytime <lipengfei.dev@gmail.com>
Date: Mon, 6 May 2024 23:15:00 +0800
Subject: [PATCH] MOD: advanced RDS & AF/EON view now support screensavor

---
 TEF6686_ESP32.ino | 86 +++++++++++++++++++++++++----------------------
 src/gui.cpp       |  1 -
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index d61f1eb..2b39e0a 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1087,7 +1087,7 @@ void loop() {
     if (screensaver_IRQ)
     {
       screensaver_IRQ = OFF;
-      if (!screensavertriggered && !advancedRDS && !menu) {
+      if (!screensavertriggered && !menu) {
         WakeToSleep(true);
       }
     }
@@ -1594,49 +1594,49 @@ void BANDBUTTONPress() {
       }
     } else {
       if (!usesquelch) radio.setUnMute();
-      if (afscreen) {
-        BuildAdvancedRDS();
-      } else {
-        unsigned long counterold = millis();
-        unsigned long counter = millis();
-        if (!menu) {
-          while (digitalRead(BANDBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
+      unsigned long counterold = millis();
+      unsigned long counter = millis();
+      if (!menu) {
+        while (digitalRead(BANDBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
 
-          if (counter - counterold < 1000) {
-            if (screensavertriggered) {
-              WakeToSleep(REVERSE);
-              return;
-            }
-
-            if (advancedRDS) {
-              BuildDisplay();
-              ScreensaverTimerReopen();
-            } else {
-              if (tunemode != TUNE_MEM) {
-                ToggleBand(band);
-                StoreFrequency();
-                SelectBand();
-                if (XDRGTKUSB || XDRGTKTCP) {
-                  if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
-                }
-              } else {
-                scanmodeold = tunemode;
-                startFMDXScan();
-                return;
-              }
-              ScreensaverTimerRestart();
-            }
+        if (counter - counterold < 1000) {
+          if (screensavertriggered) {
+            WakeToSleep(REVERSE);
+            return;
+          }
+          if (afscreen) {
+            BuildAdvancedRDS();
+          } else if (advancedRDS) {
+            BuildDisplay();
+            ScreensaverTimerReopen();
           } else {
-            if (screensavertriggered) {
-              WakeToSleep(REVERSE);
+            if (tunemode != TUNE_MEM) {
+              ToggleBand(band);
+              StoreFrequency();
+              SelectBand();
+              if (XDRGTKUSB || XDRGTKTCP) {
+                if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n");
+                else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n");
+                else DataPrint("M1\nT" + String(frequency_AM) + "\n");
+              }
+            } else {
+              scanmodeold = tunemode;
+              startFMDXScan();
               return;
             }
+            ScreensaverTimerRestart();
+          }
+        } else {
+          if (screensavertriggered) {
+            WakeToSleep(REVERSE);
+            return;
+          }
 
-            if (band < BAND_GAP) {
-              if (advancedRDS && !seek) BuildAFScreen(); else BuildAdvancedRDS();
-            } else {
-              WakeToSleep(true);
-            }
+          if (band < BAND_GAP) {
+            if (advancedRDS && !seek) BuildAFScreen();
+            else BuildAdvancedRDS();
+          } else {
+            WakeToSleep(true);
           }
         }
       }
@@ -3945,7 +3945,13 @@ void MuteScreen(bool setting) {
     setupmode = true;
     tft.writecommand(0x11);
     analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
-    BuildDisplay();
+    if (band < BAND_GAP) {
+      if (afscreen) BuildAFScreen(); 
+      else if (advancedRDS) BuildAdvancedRDS();
+      else BuildDisplay();
+    } else {
+      BuildDisplay();
+    }
     setupmode = false;
   } else if (setting && !screenmute) {
     screenmute = true;
diff --git a/src/gui.cpp b/src/gui.cpp
index eb61eb0..f9cc294 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -1412,7 +1412,6 @@ void BuildAdvancedRDS() {
   afpage = false;
   afpagenr = 1;
   advancedRDS = true;
-  ScreensaverTimerSet(OFF);
 
   tft.fillScreen(BackgroundColor);
   tft.drawRect(0, 0, 320, 240, FrameColor);