Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-07 17:24:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

RDS Radiotext should make receiver happier (missing end char)

Browse source 
String-ized text entry
This commit is contained in:
furrtek 2017-04-18 18:12:32 +01:00
parent 62b90942ac
commit 555201b780
24 changed files with 138 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

110
firmware/application/protocols/rds.cpp
View file

@ -31,7 +31,7 @@
namespace rds {
uint32_t makeblock(uint32_t data, uint16_t offset) {
uint32_t make_block(uint32_t data, uint16_t offset) {
uint16_t CRC = 0;
uint8_t bit;
@ -58,25 +58,25 @@ uint8_t b2b(const bool in) {
}
// Type 0B groups are like 0A groups but without alternative frequency data
void make_0B_group(uint32_t blocks[], const uint16_t PI_code, const bool TP, const uint8_t PTY, const bool TA,
const bool MS, const bool DI, const uint8_t C, const char * chars) {
blocks[0] = PI_code;
blocks[1] = (0x0 << 12) | (1 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | (b2b(TA) << 4) | (b2b(MS) << 3) | (b2b(DI) << 2) | (C & 3);
blocks[2] = PI_code;
blocks[3] = (chars[0] << 8) | chars[1];
void make_0B_group(RDS_group * group, const uint16_t PI_code, const bool TP, const uint8_t PTY, const bool TA,
const bool MS, const bool DI, const uint8_t C, const std::string chars) {
group->block[0] = PI_code;
group->block[1] = (0x0 << 12) | (1 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | (b2b(TA) << 4) | (b2b(MS) << 3) | (b2b(DI) << 2) | (C & 3);
group->block[2] = PI_code;
group->block[3] = (chars[0] << 8) | chars[1];
}
// For RadioText, up to 64 chars with 2A, 32 chars with 2B
void make_2A_group(uint32_t blocks[], const uint16_t PI_code, const bool TP, const uint8_t PTY, const bool AB,
const uint8_t segment, const char * chars) {
blocks[0] = PI_code;
blocks[1] = (0x2 << 12) | (0 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | (b2b(AB) << 4) | (segment & 15);
blocks[2] = (chars[0] << 8) | chars[1];
blocks[3] = (chars[2] << 8) | chars[3];
void make_2A_group(RDS_group * group, const uint16_t PI_code, const bool TP, const uint8_t PTY, const bool AB,
const uint8_t segment, const std::string chars) {
group->block[0] = PI_code;
group->block[1] = (0x2 << 12) | (0 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | (b2b(AB) << 4) | (segment & 15);
group->block[2] = (chars[0] << 8) | chars[1];
group->block[3] = (chars[2] << 8) | chars[3];
}
// Time and date - usually one message per minute - Month: 1~12 - Day: 1~31 - Hour/Minute: 0~59 - Local offset: -12/+12 from UTC
void make_4A_group(uint32_t blocks[], const uint16_t PI_code, const bool TP, const uint8_t PTY,
void make_4A_group(RDS_group * group, const uint16_t PI_code, const bool TP, const uint8_t PTY,
const uint16_t year, const uint8_t month, const uint8_t day,
const uint8_t hour, const uint8_t minute, const int8_t local_offset) {
uint32_t L = 0;
@ -86,77 +86,69 @@ void make_4A_group(uint32_t blocks[], const uint16_t PI_code, const bool TP, con
day_code = 14956 + day + (uint32_t)((float)(year - 1900 - L) * 365.25) + uint16_t((float)((month + 1) + L * 12) * 30.6001);
blocks[0] = PI_code;
blocks[1] = (0x4 << 12) | (0 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | ((day_code & 0x18000) >> 15);
blocks[2] = ((day_code & 0x7FFF) << 1) | (hour >> 4);
blocks[3] = ((hour & 15) << 12) | ((minute & 0x3F) << 6) | (local_offset & 0x3F);
group->block[0] = PI_code;
group->block[1] = (0x4 << 12) | (0 << 11) | (b2b(TP) << 10) | ((PTY & 0x1F) << 5) | ((day_code & 0x18000) >> 15);
group->block[2] = ((day_code & 0x7FFF) << 1) | (hour >> 4);
group->block[3] = ((hour & 15) << 12) | ((minute & 0x3F) << 6) | (local_offset & 0x3F);
}
uint16_t gen_PSN(const char * psname, const RDS_flags * rds_flags) {
uint16_t gen_PSN(const std::string & psname, const RDS_flags * rds_flags) {
uint8_t c;
uint32_t group[4][4] = { 0 };
RDS_group groups[4] = { 0 };
// 4 groups with 2 PSN characters in each
for (c = 0; c < 4; c++)
make_0B_group(&group[c][0], rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, rds_flags->TA, rds_flags->MS, rds_flags->DI, c, &psname[c * 2]);
make_0B_group(&groups[c], rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, rds_flags->TA, rds_flags->MS, rds_flags->DI, c, psname.substr(c * 2, 2));
// Generate checkbits for each block of each group
for (c = 0; c < 4; c++) {
group[c][0] = makeblock(group[c][0], RDS_OFFSET_A);
group[c][1] = makeblock(group[c][1], RDS_OFFSET_B);
group[c][2] = makeblock(group[c][2], RDS_OFFSET_Cp); // C' !
group[c][3] = makeblock(group[c][3], RDS_OFFSET_D);
groups[c].block[0] = make_block(groups[c].block[0], RDS_OFFSET_A);
groups[c].block[1] = make_block(groups[c].block[1], RDS_OFFSET_B);
groups[c].block[2] = make_block(groups[c].block[2], RDS_OFFSET_Cp); // C' !
groups[c].block[3] = make_block(groups[c].block[3], RDS_OFFSET_D);
}
uint32_t * tx_data_u32 = (uint32_t*)shared_memory.bb_data.data;
// Copy to tx_data for baseband
for (c = 0; c < 4 * 4; c++)
tx_data_u32[c] = group[c >> 2][c & 3];
tx_data_u32[c] = groups[c >> 2].block[c & 3];
return 4 * 4 * 26;
}
uint16_t gen_RadioText(const char * text, const bool AB, const RDS_flags * rds_flags) {
size_t c, i;
uint32_t * group;
char radiotext_buffer[65] = { 0 };
uint8_t rtlen, groups;
strncpy(radiotext_buffer, text, 64);
rtlen = strlen(radiotext_buffer);
// Pad message with spaces to a multiple of 4 characters
while (rtlen & 3)
radiotext_buffer[rtlen++] = ' ';
uint16_t gen_RadioText(const std::string & text, const bool AB, const RDS_flags * rds_flags) {
size_t c;
RDS_group * groups_ptr;
std::string radiotext_buffer = text;
size_t rt_length, groups;
// End message with Carriage Return, as required
if (rtlen < 64) radiotext_buffer[rtlen] = 0x0D;
radiotext_buffer += 0x0D;
rt_length = radiotext_buffer.length();
rt_length = (rt_length + 3) & 0xFC;
groups = rtlen >> 2; // 4 characters per group
groups = rt_length >> 2; // 4 characters per group
group = (uint32_t*)chHeapAlloc(0, 4 * groups * sizeof(uint32_t));
groups_ptr = (RDS_group*)chHeapAlloc(0, groups * sizeof(RDS_group));
for (c = 0; c < groups; c++)
make_2A_group(&group[c * 4], rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, AB, c, &radiotext_buffer[c * 4]);
make_2A_group(&groups_ptr[c], rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, AB, c, radiotext_buffer.substr(c * 4, 4));
// Generate checkbits for each block of each group
for (c = 0; c < groups; c++) {
i = c * 4;
group[i + 0] = makeblock(group[i + 0], RDS_OFFSET_A);
group[i + 1] = makeblock(group[i + 1], RDS_OFFSET_B);
group[i + 2] = makeblock(group[i + 2], RDS_OFFSET_C);
group[i + 3] = makeblock(group[i + 3], RDS_OFFSET_D);
groups_ptr[c].block[0] = make_block(groups_ptr[c].block[0], RDS_OFFSET_A);
groups_ptr[c].block[1] = make_block(groups_ptr[c].block[1], RDS_OFFSET_B);
groups_ptr[c].block[2] = make_block(groups_ptr[c].block[2], RDS_OFFSET_C);
groups_ptr[c].block[3] = make_block(groups_ptr[c].block[3], RDS_OFFSET_D);
}
uint32_t * tx_data_u32 = (uint32_t*)shared_memory.bb_data.data;
// Copy to tx_data for baseband
for (c = 0; c < (groups * 4); c++)
tx_data_u32[c] = group[c];
for (c = 0; c < groups * 4; c++)
tx_data_u32[c] = groups_ptr[c >> 2].block[c & 3];
chHeapFree(group);
chHeapFree(groups_ptr);
return groups * 4 * 26;
}
@ -165,21 +157,21 @@ uint16_t gen_ClockTime(const RDS_flags * rds_flags,
const uint16_t year, const uint8_t month, const uint8_t day,
const uint8_t hour, const uint8_t minute, const int8_t local_offset) {
uint8_t c;
uint32_t group[4] = { 0 };
RDS_group group = { 0 };
make_4A_group(&group[0], rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, year, month, day, hour, minute, local_offset);
make_4A_group(&group, rds_flags->PI_code, rds_flags->TP, rds_flags->PTY, year, month, day, hour, minute, local_offset);
// Generate checkbits for each block
group[0] = makeblock(group[0], RDS_OFFSET_A);
group[1] = makeblock(group[1], RDS_OFFSET_B);
group[2] = makeblock(group[2], RDS_OFFSET_C);
group[3] = makeblock(group[3], RDS_OFFSET_D);
group.block[0] = make_block(group.block[0], RDS_OFFSET_A);
group.block[1] = make_block(group.block[1], RDS_OFFSET_B);
group.block[2] = make_block(group.block[2], RDS_OFFSET_C);
group.block[3] = make_block(group.block[3], RDS_OFFSET_D);
uint32_t * tx_data_u32 = (uint32_t*)shared_memory.bb_data.data;
// Copy to tx_data for baseband
for (c = 0; c < 4; c++)
tx_data_u32[c] = group[c];
tx_data_u32[c] = group.block[c];
return 4 * 26;
}