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

Fix: PTYN was not shown complete

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-27 23:26:50 +02:00
parent c00576f740
commit 38a9f86630
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+5 -10
View File
@@ -2275,7 +2275,7 @@ void ButtonPress() {
tryWiFi(); tryWiFi();
delay(2000); delay(2000);
} }
if (menupage == 2 && menuoption == 30){ if (menupage == 2 && menuoption == 30) {
doTheme(); doTheme();
} }
menuopen = false; menuopen = false;
@@ -3164,8 +3164,6 @@ void readRds() {
sprite.fillSprite(BackgroundColor); sprite.fillSprite(BackgroundColor);
sprite.pushSprite(38, 220); sprite.pushSprite(38, 220);
} else { } else {
tftPrint(-1, "PTYN N/A", 216, 109, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, String(ptynold), 216, 109, BackgroundColor, BackgroundColor, FONT16);
tft.fillCircle(86, 41, 5, SignificantColor); tft.fillCircle(86, 41, 5, SignificantColor);
tft.fillCircle(124, 41, 5, SignificantColor); tft.fillCircle(124, 41, 5, SignificantColor);
tft.fillCircle(162, 41, 5, SignificantColor); tft.fillCircle(162, 41, 5, SignificantColor);
@@ -3179,10 +3177,6 @@ void readRds() {
if (advancedRDS) tftPrint(-1, PIold, 244, 75, PrimaryColor, PrimaryColorSmooth, FONT28); else tftPrint(-1, PIold, 244, 187, PrimaryColor, PrimaryColorSmooth, FONT28); if (advancedRDS) tftPrint(-1, PIold, 244, 75, PrimaryColor, PrimaryColorSmooth, FONT28); else tftPrint(-1, PIold, 244, 187, PrimaryColor, PrimaryColorSmooth, FONT28);
if (advancedRDS) tftPrint(-1, PSold, 38, 75, PrimaryColor, PrimaryColorSmooth, FONT28); else tftPrint(-1, PSold, 38, 187, PrimaryColor, PrimaryColorSmooth, FONT28); if (advancedRDS) tftPrint(-1, PSold, 38, 75, PrimaryColor, PrimaryColorSmooth, FONT28); else tftPrint(-1, PSold, 38, 187, PrimaryColor, PrimaryColorSmooth, FONT28);
if (advancedRDS) tftPrint(-1, PTYold, 38, 109, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, PTYold, 38, 163, PrimaryColor, PrimaryColorSmooth, FONT16); if (advancedRDS) tftPrint(-1, PTYold, 38, 109, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, PTYold, 38, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (advancedRDS) {
tftPrint(-1, "PTYN N/A", 216, 109, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, String(ptynold), 216, 109, BackgroundColor, BackgroundColor, FONT16);
}
dropout = false; dropout = false;
} }
} }
@@ -3286,8 +3280,9 @@ void ShowAdvancedRDS() {
if (ptynold != radio.rds.PTYN) { if (ptynold != radio.rds.PTYN) {
tftPrint(-1, "PTYN N/A", 216, 109, BackgroundColor, BackgroundColor, FONT16); tftPrint(-1, "PTYN N/A", 216, 109, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, String(ptynold), 216, 109, BackgroundColor, BackgroundColor, FONT16); tftPrint(-1, ptynold, 216, 109, BackgroundColor, BackgroundColor, FONT16);
if (radio.rds.PTYN.length() > 0) tftPrint(-1, String(ptynold), 216, 109, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "PTYN N/A", 216, 109, PrimaryColor, PrimaryColorSmooth, FONT16); if (radio.rds.PTYN.length() == 0) radio.rds.PTYN = "PTYN N/A";
tftPrint(-1, String(radio.rds.PTYN), 216, 109, PrimaryColor, PrimaryColorSmooth, FONT16);
ptynold = radio.rds.PTYN; ptynold = radio.rds.PTYN;
} }
@@ -4112,7 +4107,7 @@ void BuildAdvancedRDS() {
strcpy(programTypePrevious, "0"); strcpy(programTypePrevious, "0");
strcpy(radioIdPrevious, "0"); strcpy(radioIdPrevious, "0");
programServicePrevious = "0"; programServicePrevious = "0";
ptynold = " "; ptynold = "";
MSold = 0; MSold = 0;
ECCold = 254; ECCold = 254;
licold = 254; licold = 254;