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

Fix EON text scrolling when EON flag is detected but no content

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-02-12 23:33:26 +01:00
parent 2a3e8d7197
commit aad26ba829
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.cpp
+9 -9
View File
@@ -129,7 +129,7 @@ void ShowAdvancedRDS() {
if (xPos3 < -eonstringWidth) xPos3 = 0; if (xPos3 < -eonstringWidth) xPos3 = 0;
if (xPos3 == 0) { if (xPos3 == 0) {
if (millis() - eontickerhold >= 2000) { if (millis() - eontickerhold >= 2000) {
xPos3 --; if (radio.eon_counter != 0) xPos3 --; else xPos3 = 0;
eontickerhold = millis(); eontickerhold = millis();
} }
} else { } else {
@@ -142,7 +142,7 @@ void ShowAdvancedRDS() {
RDSSprite.fillSprite(BackgroundColor); RDSSprite.fillSprite(BackgroundColor);
if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RDSSprite.drawString(eonstring, xPos3, 2); RDSSprite.drawString(eonstring, xPos3, 2);
if (radio.rds.hasEON) RDSSprite.drawString(eonstring, xPos3 + eonstringWidth, 2); if (radio.rds.hasEON && radio.eon_counter != 0) RDSSprite.drawString(eonstring, xPos3 + eonstringWidth, 2);
RDSSprite.pushSprite(35, 172); RDSSprite.pushSprite(35, 172);
eonticker = millis(); eonticker = millis();
} }
@@ -449,17 +449,17 @@ void readRds() {
void ShowErrors() { void ShowErrors() {
uint8_t calc = 4; uint8_t calc = 4;
if (RDSstatus && !rdsreset) { if (RDSstatus && !rdsreset) {
if (!radio.rds.rdsAerror) calc--; if (!radio.rds.rdsAerror) calc--;
if (!radio.rds.rdsBerror) calc--; if (!radio.rds.rdsBerror) calc--;
if (!radio.rds.rdsCerror) calc--; if (!radio.rds.rdsCerror) calc--;
if (!radio.rds.rdsDerror) calc--; if (!radio.rds.rdsDerror) calc--;
SAvg3 = (((SAvg3 * 9) + 5) / 10) + calc; SAvg3 = (((SAvg3 * 9) + 5) / 10) + calc;
calc = SAvg3 / 10; calc = SAvg3 / 10;
} }
rdsreset = false; rdsreset = false;
if (calc != rdsqualityold || BWreset) { if (calc != rdsqualityold || BWreset) {
switch (calc) { switch (calc) {
case 0: case 0: