diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index db958ff..1afe8c9 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -129,14 +129,15 @@ bool TAold; bool TPold; bool touch_detect; bool tuned; -bool USBmode = 1; -bool XDRGTKMuteScreen; -bool wifi; -bool wificonnected; +bool USBmode; bool XDRGTKdata; +bool XDRGTKMuteScreen; bool XDRGTKTCP; bool XDRGTKUSB; bool XDRMute; +bool XDRScan; +bool wifi; +bool wificonnected; byte af_counterold; byte aid_counterold; byte af; @@ -639,7 +640,7 @@ void setup() { } tft.invertDisplay(!invertdisplay); - + pinMode(BANDBUTTON, INPUT); pinMode(MODEBUTTON, INPUT); pinMode(BWBUTTON, INPUT); @@ -3734,7 +3735,7 @@ void doBW() { BWsetFM = BWset; EEPROM.writeByte(EE_BYTE_BWSET_FM, BWsetFM); - if (XDRGTKUSB || XDRGTKTCP) { + if ((XDRGTKUSB || XDRGTKTCP) && !XDRScan) { switch (BWset) { case 0: DataPrint("W0\n"); break; case 1: DataPrint("W56000\n"); break; diff --git a/src/comms.cpp b/src/comms.cpp index 2dee999..8a08bfa 100644 --- a/src/comms.cpp +++ b/src/comms.cpp @@ -673,6 +673,7 @@ void XDRGTKRoutine() { case 'S': if (scandxmode) cancelDXScan(); + XDRScan = true; if (buff[1] == 'a') { scanner_start = (atol(buff + 2) + 5) / 10; } else if (buff[1] == 'b') { @@ -740,6 +741,7 @@ void XDRGTKRoutine() { SelectBand(); radio.setFMABandw(); BWset = 0; + XDRScan = false; } break; diff --git a/src/comms.h b/src/comms.h index f795478..f1afb79 100644 --- a/src/comms.h +++ b/src/comms.h @@ -38,6 +38,7 @@ extern bool XDRGTKdata; extern bool XDRGTKTCP; extern bool XDRGTKUSB; extern bool XDRGTKMuteScreen; +extern bool XDRScan; extern bool XDRMute; extern byte band; extern byte BWset;