kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix: Always cancel fmdxscanner when tune command is received

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-08-31 15:36:59 +02:00
parent 8ba879435c
commit 10fefe2692
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/comms.cpp
+6
View File
@@ -24,6 +24,7 @@ void Communication() {
if ((stlfreq.toInt()) / 10000 > (TEF == 205 ? 6400 : 6500) && (stlfreq.toInt()) / 10000 < 10800) { if ((stlfreq.toInt()) / 10000 > (TEF == 205 ? 6400 : 6500) && (stlfreq.toInt()) / 10000 < 10800) {
unsigned int tempfreq = (stlfreq.toInt()) / 10000; unsigned int tempfreq = (stlfreq.toInt()) / 10000;
if (scandxmode) cancelDXScan();
if (tempfreq >= FREQ_FM_OIRT_START && tempfreq <= FREQ_FM_OIRT_END) { if (tempfreq >= FREQ_FM_OIRT_START && tempfreq <= FREQ_FM_OIRT_END) {
if (band != BAND_OIRT) { if (band != BAND_OIRT) {
band = BAND_OIRT; band = BAND_OIRT;
@@ -47,6 +48,7 @@ void Communication() {
} }
if ((stlfreq.toInt()) / 1000 > 144 && (stlfreq.toInt()) / 1000 < 27000) { if ((stlfreq.toInt()) / 1000 > 144 && (stlfreq.toInt()) / 1000 < 27000) {
if (scandxmode) cancelDXScan();
if (afscreen || advancedRDS) { if (afscreen || advancedRDS) {
BuildDisplay(); BuildDisplay();
SelectBand(); SelectBand();
@@ -314,6 +316,7 @@ void Communication() {
String freq = data_str.substring(0, symPos); String freq = data_str.substring(0, symPos);
freq = freq.substring(0, freq.length() - 1); freq = freq.substring(0, freq.length() - 1);
frequency = freq.toInt(); frequency = freq.toInt();
if (scandxmode) cancelDXScan();
radio.SetFreq(frequency); radio.SetFreq(frequency);
if (afscreen) BuildAdvancedRDS(); if (afscreen) BuildAdvancedRDS();
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
@@ -527,6 +530,7 @@ void XDRGTKRoutine() {
break; break;
case 'M': case 'M':
if (scandxmode) cancelDXScan();
byte XDRband; byte XDRband;
XDRband = atol(buff + 1); XDRband = atol(buff + 1);
if (XDRband == 0) DataPrint("M0\n"); else DataPrint("M1\n"); if (XDRband == 0) DataPrint("M0\n"); else DataPrint("M1\n");
@@ -567,6 +571,7 @@ void XDRGTKRoutine() {
break; break;
case 'T': case 'T':
if (scandxmode) cancelDXScan();
unsigned int freqtemp; unsigned int freqtemp;
freqtemp = atoi(buff + 1); freqtemp = atoi(buff + 1);
@@ -666,6 +671,7 @@ void XDRGTKRoutine() {
break; break;
case 'S': case 'S':
if (scandxmode) cancelDXScan();
if (buff[1] == 'a') { if (buff[1] == 'a') {
scanner_start = (atol(buff + 2) + 5) / 10; scanner_start = (atol(buff + 2) + 5) / 10;
} else if (buff[1] == 'b') { } else if (buff[1] == 'b') {