Fixed PS data for StationList
This commit is contained in:
+9
-5
@@ -669,9 +669,8 @@ void showPTY() {
|
|||||||
|
|
||||||
void showPS() {
|
void showPS() {
|
||||||
if (radio.rds.stationName != PSold || radio.rds.hasLongPS) {
|
if (radio.rds.stationName != PSold || radio.rds.hasLongPS) {
|
||||||
if (!screenmute) {
|
|
||||||
if (afscreen) {
|
if (afscreen) {
|
||||||
tftReplace(0, PSold, radio.rds.stationName, 160, 201, BWAutoColor, BWAutoColorSmooth, BackgroundColor, 16);
|
if (!screenmute) tftReplace(0, PSold, radio.rds.stationName, 160, 201, BWAutoColor, BWAutoColorSmooth, BackgroundColor, 16);
|
||||||
} else {
|
} else {
|
||||||
if (radio.rds.hasLongPS) {
|
if (radio.rds.hasLongPS) {
|
||||||
String stationNameLongString = String(radio.rds.stationNameLong) + " ";
|
String stationNameLongString = String(radio.rds.stationNameLong) + " ";
|
||||||
@@ -710,12 +709,15 @@ void showPS() {
|
|||||||
if (!RDSstatus || band > BAND_GAP) PSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); else PSSprite.setTextColor(RDSColor, RDSColorSmooth, false);
|
if (!RDSstatus || band > BAND_GAP) PSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); else PSSprite.setTextColor(RDSColor, RDSColorSmooth, false);
|
||||||
PSSprite.drawString(radio.rds.stationName, 0, 0);
|
PSSprite.drawString(radio.rds.stationName, 0, 0);
|
||||||
}
|
}
|
||||||
if (advancedRDS) PSSprite.pushSprite(36, 74); else PSSprite.pushSprite(36, 187);
|
if (!screenmute) {
|
||||||
|
if (advancedRDS) {
|
||||||
|
PSSprite.pushSprite(36, 74);
|
||||||
|
} else {
|
||||||
|
PSSprite.pushSprite(36, 187);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PSold = radio.rds.stationName;
|
|
||||||
|
|
||||||
if (wifi && PSold != radio.rds.stationName) {
|
if (wifi && radio.rds.stationName.length() > 0 && PSold != radio.rds.stationName) {
|
||||||
Udp.beginPacket(remoteip, 9030);
|
Udp.beginPacket(remoteip, 9030);
|
||||||
Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";PS=");
|
Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";PS=");
|
||||||
char PShex[9];
|
char PShex[9];
|
||||||
@@ -728,6 +730,8 @@ void showPS() {
|
|||||||
}
|
}
|
||||||
Udp.endPacket();
|
Udp.endPacket();
|
||||||
}
|
}
|
||||||
|
PSold = radio.rds.stationName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user