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

Fixed flashing ECC and LIC during tuning on Advanced RDS view

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-26 12:54:39 +02:00
parent d04e05607d
commit 255b32f8fa
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+3 -1
View File
@@ -287,9 +287,11 @@ float batteryVold;
IPAddress remoteip; IPAddress remoteip;
String AIDString; String AIDString;
String cryptedpassword; String cryptedpassword;
String ECColdtxt; String ECColdString;
String ECCString;
String eonpsold[20]; String eonpsold[20];
String LIColdString; String LIColdString;
String LICString;
String pinstringold; String pinstringold;
String PIold; String PIold;
String PSold; String PSold;
src/rds.cpp
+11 -5
View File
@@ -60,10 +60,13 @@ void ShowAdvancedRDS() {
if (licold != radio.rds.LIC || rdsreset) { if (licold != radio.rds.LIC || rdsreset) {
if (!screenmute) { if (!screenmute) {
if (radio.rds.hasLIC) LICString = (radio.rds.LICtext.length() == 0 ? myLanguage[language][73] : radio.rds.LICtext); else LICString = "N/A";
if (LICString != LIColdString) {
tftPrint(-1, "N/A", 242, 208, BackgroundColor, BackgroundColor, 16); tftPrint(-1, "N/A", 242, 208, BackgroundColor, BackgroundColor, 16);
tftPrint(-1, LIColdString, 242, 208, BackgroundColor, BackgroundColor, 16); tftPrint(-1, LIColdString, 242, 208, BackgroundColor, BackgroundColor, 16);
if (radio.rds.hasLIC) tftPrint(-1, (radio.rds.LICtext.length() == 0 ? myLanguage[language][73] : radio.rds.LICtext), 242, 208, RDSColor, RDSColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, RDSColor, RDSColorSmooth, 16); }
if (radio.rds.LICtext.length() == 0) LIColdString = myLanguage[language][73]; else LIColdString = radio.rds.LICtext; tftPrint(-1, LICString, 242, 208, RDSColor, RDSColorSmooth, 16);
LIColdString = LICString;
licold = radio.rds.LIC; licold = radio.rds.LIC;
} }
} }
@@ -287,11 +290,14 @@ void showECC() {
if (ECCold != radio.rds.ECC) { if (ECCold != radio.rds.ECC) {
if (advancedRDS) { if (advancedRDS) {
if (!screenmute) { if (!screenmute) {
if (radio.rds.hasECC) ECCString = (radio.rds.ECCtext.length() == 0 ? myLanguage[language][73] : radio.rds.ECCtext); else ECCString = "N/A";
if (ECCString != ECColdString) {
tftPrint(-1, "N/A", 242, 193, BackgroundColor, BackgroundColor, 16); tftPrint(-1, "N/A", 242, 193, BackgroundColor, BackgroundColor, 16);
tftPrint(-1, ECColdtxt, 242, 193, BackgroundColor, BackgroundColor, 16); tftPrint(-1, ECColdString, 242, 193, BackgroundColor, BackgroundColor, 16);
if (radio.rds.hasECC) tftPrint(-1, (radio.rds.ECCtext.length() == 0 ? myLanguage[language][73] : radio.rds.ECCtext), 242, 193, RDSColor, RDSColorSmooth, 16); else tftPrint(-1, "N/A", 242, 193, RDSColor, RDSColorSmooth, 16);
} }
if (radio.rds.ECCtext.length() == 0) ECColdtxt = myLanguage[language][73]; else ECColdtxt = radio.rds.ECCtext; tftPrint(-1, ECCString, 242, 193, RDSColor, RDSColorSmooth, 16);
}
ECColdString = ECCString;
} }
if (wifi) { if (wifi) {
src/rds.h
+3 -1
View File
@@ -90,9 +90,11 @@ extern int xPos5;
extern int16_t SAvg3; extern int16_t SAvg3;
extern IPAddress remoteip; extern IPAddress remoteip;
extern String AIDString; extern String AIDString;
extern String ECColdtxt; extern String ECColdString;
extern String ECCString;
extern String eonpsold[20]; extern String eonpsold[20];
extern String LIColdString; extern String LIColdString;
extern String LICString;
extern String pinstringold; extern String pinstringold;
extern String PIold; extern String PIold;
extern String PSold; extern String PSold;