From e75afaeacbb990e5e23be1e2bfa82a31011ca900 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Thu, 10 Aug 2023 20:31:16 +0200
Subject: [PATCH] Fix for XDRGTK scan

---
 src/TEF6686.cpp | 18 ------------------
 src/TEF6686.h   |  1 -
 src/comms.cpp   |  3 ++-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index c164eeb..ba549d4 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -50,24 +50,6 @@ void TEF6686::TestAFEON() {
   if (!mute) devTEF_Audio_Set_Mute(0);
 }
 
-uint16_t TEF6686::CheckSignal(uint16_t frequency) {
-  uint16_t status;
-  uint16_t dummy1;
-  uint16_t dummy2;
-  uint8_t dummy3;
-  int16_t level;
-  uint16_t usn;
-  uint16_t wam;
-  int16_t offset;
-  byte timing = 0;
-  devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 3, frequency);
-  while (timing == 0 && !bitRead(timing, 15)) {
-    devTEF_Radio_Get_Quality_Status(&status, &level, &usn, &wam, &offset, &dummy1, &dummy2, &dummy3);
-    timing = lowByte(status);
-  }
-  return level;
-}
-
 uint16_t TEF6686::TestAF() {
   if (af_counter != 0) {
     uint16_t status;
diff --git a/src/TEF6686.h b/src/TEF6686.h
index 74dd160..3a3bc29 100644
--- a/src/TEF6686.h
+++ b/src/TEF6686.h
@@ -201,7 +201,6 @@ class TEF6686 {
     eon_ eon[20];
     rds_ rds;
     logbook_ logbook[22];
-    uint16_t CheckSignal(uint16_t frequency);
     uint16_t TestAF();
     void TestAFEON();
     void readRDS(bool showrdserrors);
diff --git a/src/comms.cpp b/src/comms.cpp
index 142482d..b203863 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -411,10 +411,11 @@ void XDRGTKRoutine() {
           }
           frequencyold = frequency;
           for (freq_scan = scanner_start; freq_scan <= scanner_end; freq_scan += scanner_step) {
+			radio.SetFreq(freq_scan);
             DataPrint(String(freq_scan * 10, DEC));
             DataPrint(" = ");
             if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else  radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR);
-            DataPrint(String((radio.CheckSignal(freq_scan) / 10) + 10, DEC));
+            DataPrint(String((SStatus / 10) + 10, DEC));
             DataPrint(", ");
           }
           DataPrint("\n");