From 32fac40ccd73f289a4a9583a301e31f6d035c8d3 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Sun, 8 Oct 2023 19:10:51 +0200
Subject: [PATCH] Speed improvement and GUI bugfix

---
 TEF6686_ESP32.ino | 19 +++++++++++++------
 src/TEF6686.cpp   |  1 -
 src/gui.cpp       |  1 +
 src/rds.cpp       |  7 -------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index 88befa6..016c5e4 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -2243,11 +2243,6 @@ void ShowFreq(int mode) {
   clearrds = true;
   ECCold = 254;
   licold = 254;
-  sprite.fillSprite(BackgroundColor);
-  sprite2.fillSprite(BackgroundColor);
-  if (!screenmute) {
-    if (advancedRDS) sprite2.pushSprite(35, 220); else if (!afscreen) sprite.pushSprite(38, 220);
-  }
 
   if (wifi) {
     Udp.beginPacket(remoteip, 9030);
@@ -2261,8 +2256,20 @@ void ShowFreq(int mode) {
     Udp.endPacket();
   }
   tuningtimer = millis();
-  if (!rdsflagreset) {
+  
+  if (!rdsflagreset && !screenmute && !afscreen) {
     ShowRDSLogo(false);
+    sprite.fillSprite(BackgroundColor);
+    sprite2.fillSprite(BackgroundColor);
+    if (!advancedRDS) {
+      tft.fillCircle(314, 223, 2, GreyoutColor);
+      tft.fillCircle(314, 234, 2, GreyoutColor);
+      sprite.pushSprite(38, 220);
+    } else {
+      tft.fillCircle(203, 223, 2, GreyoutColor);
+      tft.fillCircle(203, 234, 2, GreyoutColor);
+      sprite2.pushSprite(35, 220);
+    }
     rdsflagreset = true;
   }
 }
diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index ee369ea..6cceb2a 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -738,7 +738,6 @@ void TEF6686::readRDS(byte showrdserrors)
             rds.hour += rds.offset;
             rds.hour = (((byte)rds.hour + 24) % 24);
             rds.hasCT = true;
-            Serial.println(rds.offset);
           }
         } break;
 
diff --git a/src/gui.cpp b/src/gui.cpp
index 9ecafe6..9765d48 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -328,6 +328,7 @@ void BuildAFScreen() {
     tft.drawLine(168, 30, 168, 199, FrameColor);
     tft.drawLine(53, 30, 53, 0, FrameColor);
     tft.drawLine(89, 30, 89, 0, FrameColor);
+    tft.drawLine(120, 30, 120, 0, FrameColor);
     tft.drawLine(158, 30, 158, 0, FrameColor);
     tft.drawLine(248, 30, 248, 0, FrameColor);
     tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
diff --git a/src/rds.cpp b/src/rds.cpp
index d364ead..ac6d4e6 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -596,13 +596,6 @@ void readRds() {
               tft.fillCircle(162, 41, 5, SignificantColor);
               tft.fillCircle(200, 41, 5, SignificantColor);
             }
-            if (!advancedRDS) {
-              tft.fillCircle(314, 223, 2, GreyoutColor);
-              tft.fillCircle(314, 234, 2, GreyoutColor);
-            } else {
-              tft.fillCircle(203, 223, 2, GreyoutColor);
-              tft.fillCircle(203, 234, 2, GreyoutColor);
-            }
             clearrds = false;
           }
           if (radio.rds.correctPI != 0) dropout = true;