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

Fixed RDS reset when choosing memorychannel to store

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-10-29 00:30:48 +02:00
parent fd4c58531a
commit 460e3a282a
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+16 -12
View File
@@ -465,7 +465,7 @@ void setup() {
btStop(); btStop();
if (USBmode) Serial.begin(19200); else Serial.begin(115200); if (USBmode) Serial.begin(19200); else Serial.begin(115200);
if (iMSset == 1 && EQset == 1) iMSEQ = 2; if (iMSset == 1 && EQset == 1) iMSEQ = 2;
if (iMSset == 0 && EQset == 1) iMSEQ = 3; if (iMSset == 0 && EQset == 1) iMSEQ = 3;
if (iMSset == 1 && EQset == 0) iMSEQ = 4; if (iMSset == 1 && EQset == 0) iMSEQ = 4;
@@ -1732,9 +1732,9 @@ void BWButtonPress() {
if (band == BAND_FM || band == BAND_OIRT) { if (band == BAND_FM || band == BAND_OIRT) {
doStereoToggle(); doStereoToggle();
} else { } else {
BWset++; BWset++;
doBW(); doBW();
BWtune = true; BWtune = true;
} }
} else { } else {
BWset++; BWset++;
@@ -2198,10 +2198,12 @@ void KeyUp() {
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM));
} }
if (radio.rds.hasCT) tftPrint(1, rds_clock, 205, 163, BackgroundColor, BackgroundColor, 16); if (!memorystore) {
radio.clearRDS(fullsearchrds); if (radio.rds.hasCT) tftPrint(1, rds_clock, 205, 163, BackgroundColor, BackgroundColor, 16);
ShowFreq(0); radio.clearRDS(fullsearchrds);
store = true; ShowFreq(0);
store = true;
}
} else { } else {
MenuUp(); MenuUp();
} }
@@ -2244,10 +2246,12 @@ void KeyDown() {
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM));
} }
if (radio.rds.hasCT) tftPrint(1, rds_clock, 38, 109, BackgroundColor, BackgroundColor, 16); if (!memorystore) {
radio.clearRDS(fullsearchrds); if (radio.rds.hasCT) tftPrint(1, rds_clock, 205, 163, BackgroundColor, BackgroundColor, 16);
ShowFreq(0); radio.clearRDS(fullsearchrds);
store = true; ShowFreq(0);
store = true;
}
} else { } else {
MenuDown(); MenuDown();
} }