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

Fix flashing PI in USA mode while searching callsign in database

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-11-07 12:33:52 +01:00
parent 1a6c294bf8
commit 5d86568f48
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
-3
View File
@@ -407,14 +407,12 @@ void TEF6686::readRDS(byte showrdserrors)
rds.picode[i] += 'A' - 10; // Add ASCII offset for hexadecimal letters A-F rds.picode[i] += 'A' - 10; // Add ASCII offset for hexadecimal letters A-F
} }
} }
rds.picodetext = rds.picode;
} }
if (!rdsAerrorThreshold && !rdsBerrorThreshold && !rdsCerrorThreshold && !rdsDerrorThreshold) { if (!rdsAerrorThreshold && !rdsBerrorThreshold && !rdsCerrorThreshold && !rdsDerrorThreshold) {
rds.picode[4] = ' '; rds.picode[4] = ' ';
rds.picode[5] = ' '; rds.picode[5] = ' ';
errorfreepi = true; errorfreepi = true;
rds.picodetext = rds.picode;
} }
if (!errorfreepi) { if (!errorfreepi) {
@@ -1435,7 +1433,6 @@ void TEF6686::clearRDS (bool fullsearchrds) {
rds.PTYN = ""; rds.PTYN = "";
rds.ECCtext = ""; rds.ECCtext = "";
rds.LICtext = ""; rds.LICtext = "";
rds.picodetext = "";
rds.stationIDtext = ""; rds.stationIDtext = "";
rds.stationStatetext = ""; rds.stationStatetext = "";
src/TEF6686.h
-1
View File
@@ -560,7 +560,6 @@ typedef struct _rds_ {
String PTYN; String PTYN;
String ECCtext; String ECCtext;
String LICtext; String LICtext;
String picodetext;
String stationIDtext; String stationIDtext;
String stationStatetext; String stationStatetext;
char stationType[18]; char stationType[18];
src/rds.cpp
+3 -3
View File
@@ -396,13 +396,13 @@ void readRds() {
} }
void showPI() { void showPI() {
if ((region == REGION_US && (radio.rds.picodetext != PIold || radio.rds.stationIDtext != stationIDold || radio.rds.stationStatetext != stationStateold)) || (region != REGION_US && radio.rds.picodetext != PIold)) { if ((region == REGION_US && (String(radio.rds.picode) != PIold || radio.rds.stationIDtext != stationIDold || radio.rds.stationStatetext != stationStateold)) || (region != REGION_US && String(radio.rds.picode) != PIold)) {
if (!afscreen && !radio.rds.rdsAerror && !radio.rds.rdsBerror && !radio.rds.rdsCerror && !radio.rds.rdsDerror && radio.rds.rdsA != radio.rds.correctPI && PIold.length() > 1) radio.clearRDS(fullsearchrds); if (!afscreen && !radio.rds.rdsAerror && !radio.rds.rdsBerror && !radio.rds.rdsCerror && !radio.rds.rdsDerror && radio.rds.rdsA != radio.rds.correctPI && PIold.length() > 1) radio.clearRDS(fullsearchrds);
if (!screenmute) { if (!screenmute) {
if (advancedRDS) { if (advancedRDS) {
if (region == REGION_EU) tftReplace(0, PIold, radio.rds.picode, 275, 75, PrimaryColor, PrimaryColorSmooth, 28); if (region == REGION_EU) tftReplace(0, PIold, radio.rds.picode, 275, 75, PrimaryColor, PrimaryColorSmooth, 28);
if (region == REGION_US) { if (region == REGION_US) {
tftReplace(-1, PIold, radio.rds.picode, 240, 72, PrimaryColor, PrimaryColorSmooth, 16); if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 72, PrimaryColor, PrimaryColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, PrimaryColor, PrimaryColorSmooth, 16); tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, PrimaryColor, PrimaryColorSmooth, 16);
tftReplace(1, stationStateold, radio.rds.stationState, 318, 89, SecondaryColor, SecondaryColorSmooth, 16); tftReplace(1, stationStateold, radio.rds.stationState, 318, 89, SecondaryColor, SecondaryColorSmooth, 16);
} }
@@ -411,7 +411,7 @@ void showPI() {
} else { } else {
if (region == REGION_EU) tftReplace(0, PIold, radio.rds.picode, 275, 187, PrimaryColor, PrimaryColorSmooth, 28); if (region == REGION_EU) tftReplace(0, PIold, radio.rds.picode, 275, 187, PrimaryColor, PrimaryColorSmooth, 28);
if (region == REGION_US) { if (region == REGION_US) {
tftReplace(-1, PIold, radio.rds.picode, 240, 184, PrimaryColor, PrimaryColorSmooth, 16); if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 184, PrimaryColor, PrimaryColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, PrimaryColor, PrimaryColorSmooth, 16); tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, PrimaryColor, PrimaryColorSmooth, 16);
tftReplace(1, stationStateold, radio.rds.stationState, 318, 201, SecondaryColor, SecondaryColorSmooth, 16); tftReplace(1, stationStateold, radio.rds.stationState, 318, 201, SecondaryColor, SecondaryColorSmooth, 16);
} }