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

Fixed 0x0d handling on LPS RDS parsing

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-21 12:40:44 +02:00
parent 5f7577af07
commit 19aa516890
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
+6 -4
View File
@@ -1518,8 +1518,10 @@ void TEF6686::readRDS(byte showrdserrors) {
pslong_buffer[32] = '\0'; pslong_buffer[32] = '\0';
byte endmarker = 32; byte endmarker = 32;
bool foundendmarker = false;
for (byte i = 0; i < 33; i++) { for (byte i = 0; i < 33; i++) {
if (pslong_buffer[i] == 0x0d) { if (pslong_buffer[i] == 0x0d) {
foundendmarker = true;
endmarker = i; endmarker = i;
break; break;
} }
@@ -1529,7 +1531,7 @@ void TEF6686::readRDS(byte showrdserrors) {
if (strcmp(pslong_buffer, pslong_buffer2) == 0) { // When no difference between current and buffer, let's go... if (strcmp(pslong_buffer, pslong_buffer2) == 0) { // When no difference between current and buffer, let's go...
RDScharConverter(pslong_buffer, PSLongtext, sizeof(PSLongtext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII RDScharConverter(pslong_buffer, PSLongtext, sizeof(PSLongtext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII
String utf8String = convertToUTF8(PSLongtext); // Convert RDS characterset to ASCII String utf8String = convertToUTF8(PSLongtext); // Convert RDS characterset to ASCII
rds.stationNameLong = extractUTF8Substring(utf8String, 0, endmarker, true); // Make sure PS Long does not exceed 32 characters rds.stationNameLong = extractUTF8Substring(utf8String, 0, endmarker, true); // Make sure PS Long does not exceed 32 characters
} }
} }
@@ -1538,10 +1540,10 @@ void TEF6686::readRDS(byte showrdserrors) {
if (offset == 4) packet1long = true; if (offset == 4) packet1long = true;
if (offset == 8) packet2long = true; if (offset == 8) packet2long = true;
if (offset == 16) packet3long = true; if (offset == 16) packet3long = true;
RDScharConverter(pslong_buffer, PSLongtext, sizeof(PSLongtext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII RDScharConverter(pslong_buffer, PSLongtext, sizeof(PSLongtext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII
String utf8String = convertToUTF8(PSLongtext); // Convert RDS characterset to ASCII String utf8String = convertToUTF8(PSLongtext); // Convert RDS characterset to ASCII
rds.stationNameLong = extractUTF8Substring(utf8String, 0, endmarker, true); rds.stationNameLong = extractUTF8Substring(utf8String, 0, endmarker, true);
if (packet0long && packet1long && packet2long && packet3long) pslong_process = true; // OK, we had one runs, now let's go the idle PS Long writing if ((packet0long && packet1long && packet2long && packet3long) || foundendmarker) pslong_process = true; // OK, we had one runs, now let's go the idle PS Long writing
} }
} }
} }