Fixed a problem when using FM scanner with cancel on correct PI
This commit is contained in:
+6
-1
@@ -76,6 +76,7 @@ bool hasCTold;
|
|||||||
bool haseonold;
|
bool haseonold;
|
||||||
bool hasrtplusold;
|
bool hasrtplusold;
|
||||||
bool hastmcold;
|
bool hastmcold;
|
||||||
|
bool initdxscan;
|
||||||
bool leave;
|
bool leave;
|
||||||
bool LowLevelInit;
|
bool LowLevelInit;
|
||||||
bool memorystore;
|
bool memorystore;
|
||||||
@@ -846,6 +847,7 @@ void loop() {
|
|||||||
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
|
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
|
||||||
}
|
}
|
||||||
scantimer = millis();
|
scantimer = millis();
|
||||||
|
initdxscan = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (millis() >= flashingtimer + 500) {
|
if (millis() >= flashingtimer + 500) {
|
||||||
@@ -861,11 +863,13 @@ void loop() {
|
|||||||
}
|
}
|
||||||
delay(50);
|
delay(50);
|
||||||
radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
|
radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
|
||||||
|
if (!initdxscan) {
|
||||||
switch (scancancel) {
|
switch (scancancel) {
|
||||||
case CORRECTPI: if (radio.rds.correctPI != 0) cancelDXScan(); break;
|
case CORRECTPI: if (RDSstatus && radio.rds.correctPI != 0) cancelDXScan(); break;
|
||||||
case SIGNAL: if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80)) cancelDXScan(); break;
|
case SIGNAL: if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80)) cancelDXScan(); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (millis() >= tuningtimer + 200) {
|
if (millis() >= tuningtimer + 200) {
|
||||||
if (store) {
|
if (store) {
|
||||||
@@ -4480,6 +4484,7 @@ void endMenu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void startFMDXScan() {
|
void startFMDXScan() {
|
||||||
|
initdxscan = true;
|
||||||
if (afscreen || advancedRDS) BuildDisplay();
|
if (afscreen || advancedRDS) BuildDisplay();
|
||||||
|
|
||||||
if (memorypos > scanstop || memorypos < scanstart) memorypos = scanstart;
|
if (memorypos > scanstop || memorypos < scanstart) memorypos = scanstart;
|
||||||
|
|||||||
Reference in New Issue
Block a user