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

Fix on cancel on signal for DX scan mode

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-04-12 16:33:11 +02:00
parent 9ac86cb97e
commit 514c0fbf47
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+18 -7
View File
@@ -803,12 +803,6 @@ void loop() {
if (digitalRead(BANDBUTTON) == LOW ) BANDBUTTONPress(); if (digitalRead(BANDBUTTON) == LOW ) BANDBUTTONPress();
if (scandxmode) { if (scandxmode) {
if (screenmute) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
switch (scancancel) {
case CORRECTPI: if (radio.rds.correctPI != 0) cancelDXScan(); break;
case SIGNAL: if (USN < 250 && WAM < 250 && OStatus > -250 && OStatus < 250 && !SQ) cancelDXScan(); break;
}
if (millis() >= flashingtimer + 500) { if (millis() >= flashingtimer + 500) {
flashing = !flashing; flashing = !flashing;
if (flashing) { if (flashing) {
@@ -828,6 +822,12 @@ void loop() {
} }
flashingtimer = millis(); flashingtimer = millis();
} }
radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, CN);
switch (scancancel) {
case CORRECTPI: if (radio.rds.correctPI != 0) cancelDXScan(); break;
case SIGNAL: if (USN < 250 && WAM < 250 && OStatus > -250 && OStatus < 250) cancelDXScan(); break;
}
} }
if (scandxmode && millis() >= scantimer + (scanhold * 1000)) { if (scandxmode && millis() >= scantimer + (scanhold * 1000)) {
@@ -1458,6 +1458,7 @@ void BANDBUTTONPress() {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n"); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
} else { } else {
scanmodeold = tunemode;
startFMDXScan(); startFMDXScan();
return; return;
} }
@@ -2622,7 +2623,7 @@ void DoMemoryPosTune() {
} }
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
// RDSstatus = false; // RDSstatus = false;
if (RDSSPYUSB) Serial.print("G:\r\nRESET-------\r\n\r\n"); if (RDSSPYUSB) Serial.print("G:\r\nRESET-------\r\n\r\n");
if (RDSSPYTCP) RemoteClient.print("G:\r\nRESET-------\r\n\r\n"); if (RDSSPYTCP) RemoteClient.print("G:\r\nRESET-------\r\n\r\n");
@@ -4323,6 +4324,16 @@ void cancelDXScan() {
} else { } else {
tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor); tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
} }
if (!flashing) {
if (CurrentSkin == 1) {
tft.pushImage (12, 76, 33, 15, skin1_memon);
} else {
tft.drawRoundRect(1, 79, 42, 20, 5, ActiveColor);
tftPrint(0, "MEM", 22, 82, ActiveColor, ActiveColorSmooth, 16);
}
}
SQ = false; SQ = false;
Squelchold = -2; Squelchold = -2;
} }