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

More work on RT+ routines

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-02 22:00:50 +02:00
parent 9b3f3e573b
commit 93450ecb5e
2 changed files with 145 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
+129 -90
View File
@@ -323,17 +323,17 @@ void TEF6686::readRDS(bool showrdserrors)
if (offset == 3 && ps_process == true) { // Last chars are received if (offset == 3 && ps_process == true) { // Last chars are received
if (ps_buffer != ps_buffer2) { // When difference between old and new, let's go... if (ps_buffer != ps_buffer2) { // When difference between old and new, let's go...
RDScharConverter(ps_buffer, PStext, sizeof(PStext) / sizeof(wchar_t)); // Convert 8 bit ASCII to 16 bit ASCII RDScharConverter(ps_buffer, PStext, sizeof(PStext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII
String utf8String = convertToUTF8(PStext); // Convert RDS characterset to ASCII String utf8String = convertToUTF8(PStext); // Convert RDS characterset to ASCII
rds.stationName = extractUTF8Substring(utf8String, 0, 8); // Make sure PS does not exceed 8 characters rds.stationName = extractUTF8Substring(utf8String, 0, 8, true); // Make sure PS does not exceed 8 characters
} }
} }
if (ps_process == false) { // Let's get 2 runs of 8 PS characters fast and without refresh if (ps_process == false) { // Let's get 2 runs of 8 PS characters fast and without refresh
ps_counter ++; // Let's count each run ps_counter ++; // Let's count each run
RDScharConverter(ps_buffer, PStext, sizeof(PStext) / sizeof(wchar_t)); // Convert 8 bit ASCII to 16 bit ASCII RDScharConverter(ps_buffer, PStext, sizeof(PStext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII
String utf8String = convertToUTF8(PStext); // Convert RDS characterset to ASCII String utf8String = convertToUTF8(PStext); // Convert RDS characterset to ASCII
rds.stationName = extractUTF8Substring(utf8String, 0, 8); rds.stationName = extractUTF8Substring(utf8String, 0, 8, true);
if (ps_counter == 6) ps_process = true; // OK, we had 2 runs, now let's go the idle PS writing if (ps_counter == 6) ps_process = true; // OK, we had 2 runs, now let's go the idle PS writing
} }
} }
@@ -345,31 +345,33 @@ void TEF6686::readRDS(bool showrdserrors)
if (rds.region == 1) strcpy(rds.stationType, PTY_USA[rds.stationTypeCode]); if (rds.region == 1) strcpy(rds.stationType, PTY_USA[rds.stationTypeCode]);
} }
//TA decoder if (rds.correct) {
rds.hasTA = (bitRead(rds.rdsB, 4)) && (bitRead(rds.rdsB, 10)) & 0x1F; // Read TA flag //TA decoder
rds.hasTA = (bitRead(rds.rdsB, 4)) && (bitRead(rds.rdsB, 10)) & 0x1F; // Read TA flag
//MS decoder //MS decoder
if (((bitRead(rds.rdsB, 3)) & 0x1F) == 1) rds.MS = 1; else rds.MS = 2; // Read MS flag if (((bitRead(rds.rdsB, 3)) & 0x1F) == 1) rds.MS = 1; else rds.MS = 2; // Read MS flag
//AF decoder //AF decoder
uint8_t af_controlCode = rds.rdsC >> 8; uint8_t af_controlCode = rds.rdsC >> 8;
if ((af_controlCode < 224) && (af_counter < 50)) { if ((af_controlCode < 224) && (af_counter < 50)) {
uint16_t buffer0 = (rds.rdsC >> 8); uint16_t buffer0 = (rds.rdsC >> 8);
uint16_t buffer1 = (rds.rdsC & 0xFF); uint16_t buffer1 = (rds.rdsC & 0xFF);
rds.hasAF = true; rds.hasAF = true;
if (buffer0 != 0 && buffer1 != 0) { if (buffer0 != 0 && buffer1 != 0) {
buffer0 = buffer0 * 10 + 8750; buffer0 = buffer0 * 10 + 8750;
buffer1 = buffer1 * 10 + 8750; buffer1 = buffer1 * 10 + 8750;
bool isDouble = false; bool isDouble = false;
isDouble = checkDouble(buffer0); isDouble = checkDouble(buffer0);
if (!isDouble && buffer0 != 0) { if (!isDouble && buffer0 != 0) {
af[af_counter].frequency = buffer0; af[af_counter].frequency = buffer0;
af_counter++; af_counter++;
} }
isDouble = checkDouble(buffer1); isDouble = checkDouble(buffer1);
if (!isDouble && buffer1 != 0) { if (!isDouble && buffer1 != 0) {
af[af_counter].frequency = buffer1; af[af_counter].frequency = buffer1;
af_counter++; af_counter++;
}
} }
} }
} }
@@ -405,10 +407,12 @@ void TEF6686::readRDS(bool showrdserrors)
rt_buffer[offset + 3] = rds.rdsD & 0xff; // Fourth character of segment rt_buffer[offset + 3] = rds.rdsD & 0xff; // Fourth character of segment
wchar_t RTtext[65] = L""; // Create 16 bit char buffer for Extended ASCII wchar_t RTtext[65] = L""; // Create 16 bit char buffer for Extended ASCII
RDScharConverter(rt_buffer, RTtext, sizeof(RTtext) / sizeof(wchar_t)); // Convert 8 bit ASCII to 16 bit ASCII RDScharConverter(rt_buffer, RTtext, sizeof(RTtext) / sizeof(wchar_t), true); // Convert 8 bit ASCII to 16 bit ASCII
rds.stationText = convertToUTF8(RTtext); // Convert RDS characterset to ASCII rds.stationText = convertToUTF8(RTtext); // Convert RDS characterset to ASCII
rds.stationText = extractUTF8Substring(rds.stationText, 0, 64); // Make sure PS does not exceed 64 characters rds.stationText = extractUTF8Substring(rds.stationText, 0, 64, true); // Make sure RT does not exceed 64 characters
rds.stationText += " "; // Add extra space rds.stationText += " "; // Add extra space
for (int i = 0; i < 64; i++) rt_buffer2[i] = rt_buffer[i];
} }
} break; } break;
@@ -450,64 +454,95 @@ void TEF6686::readRDS(bool showrdserrors)
case RDS_GROUP_11B: case RDS_GROUP_11B:
case RDS_GROUP_12A: case RDS_GROUP_12A:
case RDS_GROUP_12B: { case RDS_GROUP_12B: {
uint16_t content_byte_1 = (rds.rdsB & 0x07); if (rds.correct) {
content_byte_1 = (content_byte_1 << 0x03); uint16_t content_byte_1 = (rds.rdsB & 0x07);
content_byte_1 += (rds.rdsC >> 0x0D); content_byte_1 = (content_byte_1 << 0x03);
uint16_t content_byte_2 = (rds.rdsC & 0x01); content_byte_1 += (rds.rdsC >> 0x0D);
content_byte_2 = (content_byte_2 << 0x05); uint16_t content_byte_2 = (rds.rdsC & 0x01);
content_byte_2 += (rds.rdsD >> 0x0B); content_byte_2 = (content_byte_2 << 0x05);
uint16_t start_marker_1 = (rds.rdsC >> 0x07); content_byte_2 += (rds.rdsD >> 0x0B);
start_marker_1 = (start_marker_1 & 0x3F); uint16_t start_marker_1 = (rds.rdsC >> 0x07);
uint16_t length_marker_1 = (rds.rdsC >> 0x01); start_marker_1 = (start_marker_1 & 0x3F);
length_marker_1 = (length_marker_1 & 0x3F); uint16_t length_marker_1 = (rds.rdsC >> 0x01);
uint16_t start_marker_2 = (rds.rdsD >> 0x05); length_marker_1 = (length_marker_1 & 0x3F);
start_marker_2 = (start_marker_2 & 0x3F); uint16_t start_marker_2 = (rds.rdsD >> 0x05);
uint16_t length_marker_2 = (rds.rdsD & 0x1F); start_marker_2 = (start_marker_2 & 0x3F);
rds.hasRDSplus = true; uint16_t length_marker_2 = (rds.rdsD & 0x1F);
rds.hasRDSplus = true;
if (content_byte_1 == 0x04) { // Artist if (content_byte_1 == 0x04) { // Artist
rds.hasMusicArtist = true; rds.hasArtist = true;
for (int i = 0; i <= length_marker_1; i++)rds.musicArtist[i] = rt_buffer2[i + start_marker_1]; for (int i = 0; i <= length_marker_1; i++)musicArtist[i] = rt_buffer2[i + start_marker_1];
rds.musicArtist[length_marker_1 + 1] = 0; musicArtist[length_marker_1 + 1] = 0;
} else if (content_byte_1 == 0x01) { // Title } else if (content_byte_1 == 0x01) { // Title
rds.hasMusicTitle = true; rds.hasTitle = true;
for (int i = 0; i <= length_marker_1; i++)rds.musicTitle[i] = rt_buffer2[i + start_marker_1]; for (int i = 0; i <= length_marker_1; i++)musicTitle[i] = rt_buffer2[i + start_marker_1];
rds.musicTitle[length_marker_1 + 1] = 0; musicTitle[length_marker_1 + 1] = 0;
}
if (content_byte_2 == 0x04) { // Artist
rds.hasArtist = true;
for (int i = 0; i <= length_marker_2; i++)musicArtist[i] = rt_buffer2[i + start_marker_2];
musicArtist[length_marker_2 + 1] = 0;
} else if (content_byte_2 == 0x01) { // Title
rds.hasTitle = true;
for (int i = 0; i <= length_marker_2; i++)musicTitle[i] = rt_buffer2[i + start_marker_2];
musicTitle[length_marker_2 + 1] = 0;
}
if (content_byte_1 == 0x24) { // Host
rds.hasHost = true;
for (int i = 0; i <= length_marker_1; i++)stationHost[i] = rt_buffer2[i + start_marker_1];
stationHost[length_marker_1 + 1] = 0;
} else if (content_byte_2 == 0x24) { // Host
rds.hasHost = true;
for (int i = 0; i <= length_marker_2; i++)stationHost[i] = rt_buffer2[i + start_marker_2];
stationHost[length_marker_2 + 1] = 0;
}
if (content_byte_1 == 0x21) { // Event
rds.hasEvent = true;
for (int i = 0; i <= length_marker_1; i++)stationEvent[i] = rt_buffer2[i + start_marker_1];
stationEvent[length_marker_1 + 1] = 0;
} else if (content_byte_2 == 0x21) { // Event
rds.hasEvent = true;
for (int i = 0; i <= length_marker_2; i++)stationEvent[i] = rt_buffer2[i + start_marker_2];
stationEvent[length_marker_2 + 1] = 0;
}
} }
if (content_byte_2 == 0x04) { // Artist if (rds.hasArtist) {
rds.hasMusicArtist = true; wchar_t RTtext[33] = L""; // Create 16 bit char buffer for Extended ASCII
for (int i = 0; i <= length_marker_2; i++)rds.musicArtist[i] = rt_buffer2[i + start_marker_2]; RDScharConverter(musicArtist, RTtext, sizeof(RTtext) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII
rds.musicArtist[length_marker_2 + 1] = 0; rds.RTArtist = convertToUTF8(RTtext); // Convert RDS characterset to ASCII
} else if (content_byte_2 == 0x01) { // Title rds.RTArtist = extractUTF8Substring(rds.RTArtist, 0, 33, false); // Make sure RT does not exceed 32 characters
rds.hasMusicTitle = true;
for (int i = 0; i <= length_marker_2; i++)rds.musicTitle[i] = rt_buffer2[i + start_marker_2];
rds.musicTitle[length_marker_2 + 1] = 0;
} }
if (content_byte_1 == 0x24) { // Host if (rds.hasTitle) {
rds.hasStationHost = true; wchar_t RTtext[45] = L""; // Create 16 bit char buffer for Extended ASCII
for (int i = 0; i <= length_marker_1; i++)rds.stationHost[i] = rt_buffer2[i + start_marker_1]; RDScharConverter(musicTitle, RTtext, sizeof(RTtext) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII
rds.stationHost[length_marker_1 + 1] = 0; rds.RTTitle = convertToUTF8(RTtext); // Convert RDS characterset to ASCII
} else if (content_byte_2 == 0x24) { // Host rds.RTTitle = extractUTF8Substring(rds.RTTitle, 0, 44, false); // Make sure RT does not exceed 32 characters
rds.hasStationHost = true;
for (int i = 0; i <= length_marker_2; i++)rds.stationHost[i] = rt_buffer2[i + start_marker_2];
rds.stationHost[length_marker_2 + 1] = 0;
} }
if (content_byte_1 == 0x21) { // Event if (rds.hasEvent) {
rds.hasStationEvent = true; wchar_t RTtext[45] = L""; // Create 16 bit char buffer for Extended ASCII
for (int i = 0; i <= length_marker_1; i++)rds.stationEvent[i] = rt_buffer2[i + start_marker_1]; RDScharConverter(stationEvent, RTtext, sizeof(RTtext) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII
rds.stationEvent[length_marker_1 + 1] = 0; rds.RTEvent = convertToUTF8(RTtext); // Convert RDS characterset to ASCII
} else if (content_byte_2 == 0x21) { // Event rds.RTEvent = extractUTF8Substring(rds.RTEvent, 0, 44, false); // Make sure RT does not exceed 32 characters
rds.hasStationEvent = true;
for (int i = 0; i <= length_marker_2; i++)rds.stationEvent[i] = rt_buffer2[i + start_marker_2];
rds.stationEvent[length_marker_2 + 1] = 0;
} }
} break;
if (rds.hasHost) {
wchar_t RTtext[45] = L""; // Create 16 bit char buffer for Extended ASCII
RDScharConverter(stationHost, RTtext, sizeof(RTtext) / sizeof(wchar_t), false); // Convert 8 bit ASCII to 16 bit ASCII
rds.RTHost = convertToUTF8(RTtext); // Convert RDS characterset to ASCII
rds.RTHost = extractUTF8Substring(rds.RTHost, 0, 44, false); // Make sure RT does not exceed 32 characters
}
}
break;
case RDS_GROUP_14A: { case RDS_GROUP_14A: {
rds.hasEON = true; // Group is there, so we have EON if (rds.correct) rds.hasEON = true; // Group is there, so we have EON
} break; } break;
} }
} }
@@ -529,6 +564,10 @@ void TEF6686::clearRDS (bool fullsearchrds)
uint8_t i; uint8_t i;
rds.stationName = ""; rds.stationName = "";
rds.stationText = ""; rds.stationText = "";
rds.RTArtist = "";
rds.RTTitle = "";
rds.RTHost = "";
rds.RTEvent = "";
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
ps_buffer[i] = 0; ps_buffer[i] = 0;
PStext[i] = L'\0'; PStext[i] = L'\0';
@@ -538,11 +577,11 @@ void TEF6686::clearRDS (bool fullsearchrds)
for (i = 0; i < 6; i++) rds.picode[i] = 0; for (i = 0; i < 6; i++) rds.picode[i] = 0;
for (i = 0; i < 50; i++) af[i].frequency = 0; for (i = 0; i < 50; i++) af[i].frequency = 0;
for (i = 0; i < 32; i++) { for (i = 0; i < 45; i++) {
rds.musicArtist[i] = 0; musicArtist[i] = 0;
rds.musicTitle[i] = 0; musicTitle[i] = 0;
rds.stationEvent[i] = 0; stationEvent[i] = 0;
rds.stationHost[i] = 0; stationHost[i] = 0;
} }
rds.ECC = 0; rds.ECC = 0;
@@ -558,10 +597,10 @@ void TEF6686::clearRDS (bool fullsearchrds)
rt_process = false; rt_process = false;
ps_process = false; ps_process = false;
rds.rdsreset = true; rds.rdsreset = true;
rds.hasMusicTitle = false; rds.hasTitle = false;
rds.hasMusicArtist = false; rds.hasArtist = false;
rds.hasStationEvent = false; rds.hasEvent = false;
rds.hasStationHost = false; rds.hasHost = false;
correctpi = false; correctpi = false;
ps_counter = 0; ps_counter = 0;
af_counter = 0; af_counter = 0;
@@ -599,7 +638,7 @@ String TEF6686::convertToUTF8(const wchar_t* input) {
return output; return output;
} }
String TEF6686::extractUTF8Substring(const String& utf8String, size_t start, size_t length) { String TEF6686::extractUTF8Substring(const String& utf8String, size_t start, size_t length, bool under) {
String substring; String substring;
size_t utf8Length = utf8String.length(); size_t utf8Length = utf8String.length();
size_t utf8Index = 0; size_t utf8Index = 0;
@@ -627,7 +666,7 @@ String TEF6686::extractUTF8Substring(const String& utf8String, size_t start, siz
charIndex++; charIndex++;
} }
if (rds.underscore) { if (under && rds.underscore) {
while (substring.length() < length) { while (substring.length() < length) {
substring += '_'; substring += '_';
} }
@@ -637,11 +676,11 @@ String TEF6686::extractUTF8Substring(const String& utf8String, size_t start, siz
} }
void TEF6686::RDScharConverter(const char* input, wchar_t* output, size_t size) { void TEF6686::RDScharConverter(const char* input, wchar_t* output, size_t size, bool under) {
for (size_t i = 0; i < size - 1; i++) { for (size_t i = 0; i < size - 1; i++) {
char currentChar = input[i]; char currentChar = input[i];
switch (currentChar) { switch (currentChar) {
case 0x20: if (rds.underscore) output[i] = L'_'; else output[i] = L' '; break; case 0x20: if (under && rds.underscore) output[i] = L'_'; else output[i] = L' '; break;
case 0x21 ... 0x5D: output[i] = static_cast<wchar_t>(currentChar); break; case 0x21 ... 0x5D: output[i] = static_cast<wchar_t>(currentChar); break;
case 0x5E: output[i] = L'―'; break; case 0x5E: output[i] = L'―'; break;
case 0x5F: output[i] = L'_'; break; case 0x5F: output[i] = L'_'; break;
src/TEF6686.h
+16 -12
View File
@@ -97,12 +97,12 @@ typedef struct _rds_ {
byte MS; byte MS;
String stationName; String stationName;
String stationText; String stationText;
String RTArtist;
String RTTitle;
String RTHost;
String RTEvent;
char stationType[17]; char stationType[17];
char picode[6]; char picode[6];
char musicTitle[48];
char musicArtist[48];
char stationHost[48];
char stationEvent[48];
uint16_t hours, minutes, days, months, years, offsetplusmin, rdsA, rdsB, rdsC, rdsD, rdsErr; uint16_t hours, minutes, days, months, years, offsetplusmin, rdsA, rdsB, rdsC, rdsD, rdsErr;
int8_t offset; int8_t offset;
int ECC; int ECC;
@@ -120,10 +120,10 @@ typedef struct _rds_ {
bool hasCT; bool hasCT;
bool rtAB; bool rtAB;
bool hasRDSplus; bool hasRDSplus;
bool hasMusicTitle; bool hasTitle;
bool hasMusicArtist; bool hasArtist;
bool hasStationHost; bool hasHost;
bool hasStationEvent; bool hasEvent;
bool correct; bool correct;
bool filter; bool filter;
bool underscore; bool underscore;
@@ -184,15 +184,15 @@ class TEF6686 {
bool mute; bool mute;
private: private:
void RDScharConverter(const char* input, wchar_t* output, size_t size); void RDScharConverter(const char* input, wchar_t* output, size_t size, bool under);
String convertToUTF8(const wchar_t* input); String convertToUTF8(const wchar_t* input);
String extractUTF8Substring(const String& utf8String, size_t start, size_t length); String extractUTF8Substring(const String& utf8String, size_t start, size_t length, bool under);
char ps_buffer[9]; char ps_buffer[9];
char ps_buffer2[9]; char ps_buffer2[9];
bool ps_process; bool ps_process;
bool rt_process; bool rt_process;
char rt_buffer[65]; char rt_buffer[65];
char rt_buffer2[65]; char rt_buffer2[65];
bool useRTPlus = true; bool useRTPlus = true;
bool checkDouble (uint16_t value); bool checkDouble (uint16_t value);
bool ABold; bool ABold;
@@ -205,4 +205,8 @@ class TEF6686 {
bool rtABold; bool rtABold;
wchar_t PStext[9] = L""; wchar_t PStext[9] = L"";
byte ps_counter; byte ps_counter;
char musicArtist[45];
char musicTitle[45];
char stationHost[45];
char stationEvent[45];
}; };