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

Fix: Respect holdtime on DX scanner even when signal drops out

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-08-31 20:23:48 +02:00
parent 908c339739
commit 19d9fc9f32
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+6 -3
View File
@@ -101,6 +101,7 @@ bool RDSstatusold;
bool rdsstereoold; bool rdsstereoold;
bool rtcset; bool rtcset;
bool scandxmode; bool scandxmode;
bool scanholdflag;
bool scanholdonsignal; bool scanholdonsignal;
bool scanmem; bool scanmem;
bool scanmute; bool scanmute;
@@ -855,11 +856,12 @@ void loop() {
if (scandxmode) { if (scandxmode) {
unsigned long waitTime = (scanhold == 0) ? 500 : (scanhold * 1000); unsigned long waitTime = (scanhold == 0) ? 500 : (scanhold * 1000);
bool signalCondition = (USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80) && (OStatus > -80); if (!scanholdflag) scanholdflag = (USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80) && (OStatus > -80);
bool bypassMillisCheck = scanholdonsignal && !signalCondition; bool bypassMillisCheck = scanholdonsignal && !scanholdflag;
bool shouldScan = bypassMillisCheck || (!bypassMillisCheck && (millis() >= scantimer + waitTime)); bool shouldScan = bypassMillisCheck || (!bypassMillisCheck && (millis() >= scantimer + waitTime));
if (shouldScan) { if (shouldScan) {
scanholdflag = false;
if (scanmem) { if (scanmem) {
memorypos++; memorypos++;
if (memorypos > scanstop) memorypos = scanstart; if (memorypos > scanstop) memorypos = scanstart;
@@ -910,7 +912,7 @@ void loop() {
if (RDSstatus && radio.rds.correctPI != 0) cancelDXScan(); if (RDSstatus && radio.rds.correctPI != 0) cancelDXScan();
break; break;
case SIGNAL: case SIGNAL:
if (signalCondition) cancelDXScan(); if (scanhold) cancelDXScan();
break; break;
} }
} }
@@ -4594,6 +4596,7 @@ void endMenu() {
void startFMDXScan() { void startFMDXScan() {
initdxscan = true; initdxscan = true;
scanholdflag = false;
for (byte i = 0; i < 100; i++) { for (byte i = 0; i < 100; i++) {
rabbitearspi[i] = 0; rabbitearspi[i] = 0;
rabbitearstime[i][0] = 0; rabbitearstime[i][0] = 0;