diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp index 5d8caac..c7cb80b 100644 --- a/src/TEF6686.cpp +++ b/src/TEF6686.cpp @@ -1516,25 +1516,10 @@ void TEF6686::readRDS(byte showrdserrors) { eon_buffer[eonIndex][(offset * 2) + 1] = rds.rdsC & 0xFF; // Second character of segment } - if (offset == 0) { - eon[eonIndex].packet0 = true; - eon[eonIndex].packet1 = false; - eon[eonIndex].packet2 = false; - eon[eonIndex].packet3 = false; - } - - if (offset == 1) eon[eonIndex].packet1 = true; - if (offset == 2) eon[eonIndex].packet2 = true; - if (offset == 3) eon[eonIndex].packet3 = true; - - if (eon[eonIndex].packet0 && eon[eonIndex].packet1 && eon[eonIndex].packet2 && eon[eonIndex].packet3 && eon[eonIndex].pi == rds.rdsD) { // Last chars are received + if (eon[eonIndex].pi == rds.rdsD) { // Last chars are received RDScharConverter(eon_buffer[eonIndex], EONPStext[eonIndex], sizeof(EONPStext[eonIndex]) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII String utf8String = convertToUTF8(EONPStext[eonIndex]); // Convert RDS characterset to ASCII eon[eonIndex].ps = extractUTF8Substring(utf8String, 0, 8, false); // Make sure PS does not exceed 8 characters - eon[eonIndex].packet0 = false; - eon[eonIndex].packet1 = false; - eon[eonIndex].packet2 = false; - eon[eonIndex].packet3 = false; } if (offset == 13 && eon[eonIndex].pi == rds.rdsD) { diff --git a/src/TEF6686.h b/src/TEF6686.h index da7dc14..dc6862a 100644 --- a/src/TEF6686.h +++ b/src/TEF6686.h @@ -644,7 +644,6 @@ typedef struct _eon_ { bool tp; bool taset; uint8_t pty; - bool packet0, packet1, packet2, packet3; } eon_; typedef struct _logbook_ { diff --git a/src/rds.cpp b/src/rds.cpp index f73c2ed..ea69d93 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -935,7 +935,7 @@ void ShowAFEON() { haseonold = true; } - if (millis() >= eonticker + 1000) { + if (millis() >= eonticker + 2000) { eonticker = millis(); byte y = 0; if (afpagenr == 3) y = 10; @@ -1102,7 +1102,7 @@ void ShowAFEON() { FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.drawString(AIDString, xPos, 2); FullLineSprite.drawString(AIDString, xPos + AIDWidth, 2); - FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); + FullLineSprite.drawLine(314, 0, 314, 19, FrameColor); FullLineSprite.pushSprite(5, 220); rtticker = millis(); }