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

Show EON PS even if incomplete

Browse Source 
Fix AID ticker canvas
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-26 20:21:58 +02:00
parent f8fb1f3343
commit 5cf53d421d
3 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/TEF6686.cpp
View File

@@ -1516,25 +1516,10 @@ void TEF6686::readRDS(byte showrdserrors) {
eon_buffer[eonIndex][(offset * 2) + 1] = rds.rdsC & 0xFF; // Second character of segment eon_buffer[eonIndex][(offset * 2) + 1] = rds.rdsC & 0xFF; // Second character of segment
} }
if (offset == 0) { if (eon[eonIndex].pi == rds.rdsD) { // Last chars are received
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
RDScharConverter(eon_buffer[eonIndex], EONPStext[eonIndex], sizeof(EONPStext[eonIndex]) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII 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 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].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) { if (offset == 13 && eon[eonIndex].pi == rds.rdsD) {

1
src/TEF6686.h
View File

@@ -644,7 +644,6 @@ typedef struct _eon_ {
bool tp; bool tp;
bool taset; bool taset;
uint8_t pty; uint8_t pty;
bool packet0, packet1, packet2, packet3;
} eon_; } eon_;
typedef struct _logbook_ { typedef struct _logbook_ {

4
src/rds.cpp
View File

@@ -935,7 +935,7 @@ void ShowAFEON() {
haseonold = true; haseonold = true;
} }
if (millis() >= eonticker + 1000) { if (millis() >= eonticker + 2000) {
eonticker = millis(); eonticker = millis();
byte y = 0; byte y = 0;
if (afpagenr == 3) y = 10; if (afpagenr == 3) y = 10;
@@ -1102,7 +1102,7 @@ void ShowAFEON() {
FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
FullLineSprite.drawString(AIDString, xPos, 2); FullLineSprite.drawString(AIDString, xPos, 2);
FullLineSprite.drawString(AIDString, xPos + AIDWidth, 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); FullLineSprite.pushSprite(5, 220);
rtticker = millis(); rtticker = millis();
} }