Fixed XDRGTK bandscanner
This commit is contained in:
+6
-5
@@ -129,14 +129,15 @@ bool TAold;
|
|||||||
bool TPold;
|
bool TPold;
|
||||||
bool touch_detect;
|
bool touch_detect;
|
||||||
bool tuned;
|
bool tuned;
|
||||||
bool USBmode = 1;
|
bool USBmode;
|
||||||
bool XDRGTKMuteScreen;
|
|
||||||
bool wifi;
|
|
||||||
bool wificonnected;
|
|
||||||
bool XDRGTKdata;
|
bool XDRGTKdata;
|
||||||
|
bool XDRGTKMuteScreen;
|
||||||
bool XDRGTKTCP;
|
bool XDRGTKTCP;
|
||||||
bool XDRGTKUSB;
|
bool XDRGTKUSB;
|
||||||
bool XDRMute;
|
bool XDRMute;
|
||||||
|
bool XDRScan;
|
||||||
|
bool wifi;
|
||||||
|
bool wificonnected;
|
||||||
byte af_counterold;
|
byte af_counterold;
|
||||||
byte aid_counterold;
|
byte aid_counterold;
|
||||||
byte af;
|
byte af;
|
||||||
@@ -3734,7 +3735,7 @@ void doBW() {
|
|||||||
BWsetFM = BWset;
|
BWsetFM = BWset;
|
||||||
EEPROM.writeByte(EE_BYTE_BWSET_FM, BWsetFM);
|
EEPROM.writeByte(EE_BYTE_BWSET_FM, BWsetFM);
|
||||||
|
|
||||||
if (XDRGTKUSB || XDRGTKTCP) {
|
if ((XDRGTKUSB || XDRGTKTCP) && !XDRScan) {
|
||||||
switch (BWset) {
|
switch (BWset) {
|
||||||
case 0: DataPrint("W0\n"); break;
|
case 0: DataPrint("W0\n"); break;
|
||||||
case 1: DataPrint("W56000\n"); break;
|
case 1: DataPrint("W56000\n"); break;
|
||||||
|
|||||||
@@ -673,6 +673,7 @@ void XDRGTKRoutine() {
|
|||||||
|
|
||||||
case 'S':
|
case 'S':
|
||||||
if (scandxmode) cancelDXScan();
|
if (scandxmode) cancelDXScan();
|
||||||
|
XDRScan = true;
|
||||||
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') {
|
||||||
@@ -740,6 +741,7 @@ void XDRGTKRoutine() {
|
|||||||
SelectBand();
|
SelectBand();
|
||||||
radio.setFMABandw();
|
radio.setFMABandw();
|
||||||
BWset = 0;
|
BWset = 0;
|
||||||
|
XDRScan = false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ extern bool XDRGTKdata;
|
|||||||
extern bool XDRGTKTCP;
|
extern bool XDRGTKTCP;
|
||||||
extern bool XDRGTKUSB;
|
extern bool XDRGTKUSB;
|
||||||
extern bool XDRGTKMuteScreen;
|
extern bool XDRGTKMuteScreen;
|
||||||
|
extern bool XDRScan;
|
||||||
extern bool XDRMute;
|
extern bool XDRMute;
|
||||||
extern byte band;
|
extern byte band;
|
||||||
extern byte BWset;
|
extern byte BWset;
|
||||||
|
|||||||
Reference in New Issue
Block a user