radio95/rds95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-02-27 04:43:52 +01:00
Code Issues Wiki Activity

add a new rds2 mode

Browse Source
This commit is contained in:
KubaPro010
2025-03-23 20:52:28 +01:00
parent 567b2db76f
commit a339cdee93
3 changed files with 183 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ascii_cmd.c
View File

@@ -243,6 +243,11 @@ static void handle_program(char *arg, RDSModulator* mod, char* output) {
strcpy(output, "+\0"); strcpy(output, "+\0");
} }
static void handle_rds2mod(char *arg, RDSModulator* mod, char* output) {
mod->enc->encoder_data.rds2_mode = atoi(arg);
strcpy(output, "+\0");
}
static void handle_grpseq(char *arg, RDSModulator* mod, char* output) { static void handle_grpseq(char *arg, RDSModulator* mod, char* output) {
if (arg[0] == '\0') { if (arg[0] == '\0') {
set_rds_grpseq(mod->enc, DEFAULT_GRPSQC); set_rds_grpseq(mod->enc, DEFAULT_GRPSQC);
@@ -251,6 +256,14 @@ static void handle_grpseq(char *arg, RDSModulator* mod, char* output) {
} }
strcpy(output, "+\0"); strcpy(output, "+\0");
} }
static void handle_grpseq2(char *arg, RDSModulator* mod, char* output) {
if (arg[0] == '\0') {
set_rds_grpseq2(mod->enc, "\0");
} else {
set_rds_grpseq2(mod->enc, arg);
}
strcpy(output, "+\0");
}
static void handle_level(char *arg, RDSModulator* mod, char* output) { static void handle_level(char *arg, RDSModulator* mod, char* output) {
mod->params.level = atoi(arg)/255.0f; mod->params.level = atoi(arg)/255.0f;
@@ -536,6 +549,8 @@ static const command_handler_t commands_eq7[] = {
static const command_handler_t commands_eq8[] = { static const command_handler_t commands_eq8[] = {
{"PROGRAM", handle_program, 7}, {"PROGRAM", handle_program, 7},
{"RDS2MOD", handle_rds2mod, 7},
{"GRPSEQ2", handle_grpseq2, 7},
}; };
static const command_handler_t commands_exact[] = { static const command_handler_t commands_exact[] = {
{"INIT", handle_init, 4}, {"INIT", handle_init, 4},

284
src/rds.c
View File

@@ -55,8 +55,6 @@ void saveToFile(RDSEncoder *emp, const char *option) {
memcpy(tempEncoder.rtpData[emp->program].len, emp->rtpData[emp->program].len, sizeof(emp->rtpData[emp->program].len)); memcpy(tempEncoder.rtpData[emp->program].len, emp->rtpData[emp->program].len, sizeof(emp->rtpData[emp->program].len));
memcpy(tempEncoder.rtpData[emp->program].start, emp->rtpData[emp->program].start, sizeof(emp->rtpData[emp->program].start)); memcpy(tempEncoder.rtpData[emp->program].start, emp->rtpData[emp->program].start, sizeof(emp->rtpData[emp->program].start));
memcpy(tempEncoder.rtpData[emp->program].type, emp->rtpData[emp->program].type, sizeof(emp->rtpData[emp->program].type)); memcpy(tempEncoder.rtpData[emp->program].type, emp->rtpData[emp->program].type, sizeof(emp->rtpData[emp->program].type));
memcpy(&(tempEncoder.odas[emp->program]), &(emp->odas[emp->program]), sizeof(RDSODA)*MAX_ODAS);
memcpy(&(tempEncoder.oda_state[emp->program]), &(emp->oda_state[emp->program]), sizeof(RDSODAState));
} else if (strcmp(option, "UDG1") == 0) { } else if (strcmp(option, "UDG1") == 0) {
memcpy(tempEncoder.data[emp->program].udg1, emp->data[emp->program].udg1, sizeof(emp->data[emp->program].udg1)); memcpy(tempEncoder.data[emp->program].udg1, emp->data[emp->program].udg1, sizeof(emp->data[emp->program].udg1));
tempEncoder.data[emp->program].udg1_len = emp->data[emp->program].udg1_len; tempEncoder.data[emp->program].udg1_len = emp->data[emp->program].udg1_len;
@@ -66,8 +64,6 @@ void saveToFile(RDSEncoder *emp, const char *option) {
} else if(strcmp(option, "RTPRUN") == 0) { } else if(strcmp(option, "RTPRUN") == 0) {
tempEncoder.rtpData[emp->program].running = emp->rtpData[emp->program].running; tempEncoder.rtpData[emp->program].running = emp->rtpData[emp->program].running;
tempEncoder.rtpData[emp->program].enabled = emp->rtpData[emp->program].enabled; tempEncoder.rtpData[emp->program].enabled = emp->rtpData[emp->program].enabled;
memcpy(&(tempEncoder.odas[emp->program]), &(emp->odas[emp->program]), sizeof(RDSODA)*MAX_ODAS);
memcpy(&(tempEncoder.oda_state[emp->program]), &(emp->oda_state[emp->program]), sizeof(RDSODAState));
} else if(strcmp(option, "PTYNEN") == 0) { } else if(strcmp(option, "PTYNEN") == 0) {
tempEncoder.data[emp->program].ptyn_enabled = emp->data[emp->program].ptyn_enabled; tempEncoder.data[emp->program].ptyn_enabled = emp->data[emp->program].ptyn_enabled;
} else if(strcmp(option, "RT1EN") == 0) { } else if(strcmp(option, "RT1EN") == 0) {
@@ -81,6 +77,10 @@ void saveToFile(RDSEncoder *emp, const char *option) {
tempEncoder.program = emp->program; tempEncoder.program = emp->program;
} else if(strcmp(option, "EON") == 0) { } else if(strcmp(option, "EON") == 0) {
memcpy(&(tempEncoder.data[emp->program].eon), &(emp->data[emp->program].eon), sizeof(RDSEON)*EONS); memcpy(&(tempEncoder.data[emp->program].eon), &(emp->data[emp->program].eon), sizeof(RDSEON)*EONS);
} else if (strcmp(option, "RDS2MOD") == 0) {
tempEncoder.encoder_data.rds2_mode = emp->encoder_data.rds2_mode;
} else if (strcmp(option, "GRPSEQ2") == 0) {
memcpy(tempEncoder.data[emp->program].grp_sqc_rds2, emp->data[emp->program].grp_sqc_rds2, sizeof(emp->data[emp->program].grp_sqc_rds2));
} else if (strcmp(option, "ALL") == 0) { } else if (strcmp(option, "ALL") == 0) {
memcpy(&(tempEncoder.data[emp->program]), &(emp->data[emp->program]), sizeof(RDSData)); memcpy(&(tempEncoder.data[emp->program]), &(emp->data[emp->program]), sizeof(RDSData));
memcpy(&(tempEncoder.rtpData[emp->program]), &(emp->rtpData[emp->program]), sizeof(RDSRTPlusData)); memcpy(&(tempEncoder.rtpData[emp->program]), &(emp->rtpData[emp->program]), sizeof(RDSRTPlusData));
@@ -435,121 +435,8 @@ static uint8_t get_rds_custom_groups2(RDSEncoder* enc, uint16_t *blocks) {
return 0; return 0;
} }
static void get_rds_group(RDSEncoder* enc, uint16_t *blocks, uint8_t stream) { static void get_rds_sequence_group(RDSEncoder* enc, uint16_t *blocks, char grp) {
blocks[0] = enc->data[enc->program].pi; static uint8_t udx_idx;
blocks[1] = 0;
blocks[2] = 0;
blocks[3] = 0;
struct tm *utc;
time_t now;
time(&now);
utc = gmtime(&now);
if (utc->tm_min != enc->state[enc->program].last_minute) {
enc->state[enc->program].last_minute = utc->tm_min;
uint8_t eon_has_ta = 0;
for (int i = 0; i < EONS; i++) {
if (enc->data[enc->program].eon[i].enabled && enc->data[enc->program].eon[i].ta) {
eon_has_ta = 1;
break;
}
}
if(enc->data[enc->program].tp && enc->data[enc->program].ta && enc->state[enc->program].ta_timeout && !eon_has_ta) {
enc->state[enc->program].ta_timeout--;
if(enc->state[enc->program].ta_timeout == 0) {
enc->data[enc->program].ta = 0;
enc->state[enc->program].ta_timeout = enc->state[enc->program].original_ta_timeout;
};
}
if(enc->data[enc->program].rt1_enabled && enc->data[enc->program].rt2_enabled && enc->data[enc->program].rt_switching_period != 0) {
enc->data[enc->program].rt_switching_period--;
if(enc->data[enc->program].rt_switching_period == 0) {
enc->state[enc->program].current_rt ^= 1;
if (enc->state[enc->program].current_rt == 1) {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt2, RT_LENGTH);
} else {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt1, RT_LENGTH);
}
enc->state[enc->program].rt_state = 0;
enc->data[enc->program].rt_switching_period = enc->data[enc->program].orignal_rt_switching_period;
}
}
if(enc->data[enc->program].ct && stream == 0) {
get_rds_ct_group(enc, blocks);
goto group_coded;
}
}
if(stream != 0) {
blocks[0] = 0;
if(get_rds_custom_groups2(enc, blocks)) {
if (blocks[0] == 0 && IS_TYPE_B(blocks)) {
blocks[2] = enc->data[enc->program].pi;
}
return;
}
if(enc->encoder_data.rds2_mode == 0) { // tunneling
blocks[1] = enc->state->last_stream0_group[0];
blocks[2] = enc->state->last_stream0_group[1];
blocks[3] = enc->state->last_stream0_group[2];
if (IS_TYPE_B(blocks)) {
blocks[2] = enc->data[enc->program].pi;
}
return;
} else {
// TODO: add store command
}
}
if(get_rds_custom_groups(enc, blocks)) {
goto group_coded;
}
uint8_t good_group = 0;
uint8_t cant_find_group = 0;
char grp;
while(good_group == 0) {
uint8_t grp_sqc_idx = enc->state[enc->program].grp_seq_idx[0];
if(enc->data[enc->program].grp_sqc[grp_sqc_idx] == '\0') {
enc->state[enc->program].grp_seq_idx[0] = 0;
grp_sqc_idx = 0;
}
grp = enc->data[enc->program].grp_sqc[grp_sqc_idx];
if(grp == '0') good_group = 1;
if(grp == '1' && enc->data[enc->program].ecc != 0) good_group = 1;
if(grp == '2' && (enc->data[enc->program].rt1_enabled || enc->data[enc->program].rt2_enabled)) good_group = 1;
if(grp == 'A' && enc->data[enc->program].ptyn_enabled) good_group = 1;
if(grp == 'E') {
for (int i = 0; i < EONS; i++) {
if (enc->data[enc->program].eon[i].enabled) {
good_group = 1;
break;
}
}
}
if(grp == 'X' && enc->data[enc->program].udg1_len != 0) good_group = 1;
if(grp == 'Y' && enc->data[enc->program].udg2_len != 0) good_group = 1;
if(grp == 'R' && enc->rtpData[enc->program].enabled) good_group = 1;
if(grp == '3' && enc->oda_state[enc->program].count != 0) good_group = 1;
if(grp == 'F' && enc->data[enc->program].lps[0] != '\0') good_group = 1;
if(!good_group) cant_find_group++;
else cant_find_group = 0;
if(!good_group && cant_find_group == 23) {
cant_find_group = 0;
break;
}
enc->state[enc->program].grp_seq_idx[0]++;
}
if(!good_group) grp = '0';
uint8_t udg_idx;
switch (grp) switch (grp)
{ {
default: default:
@@ -600,7 +487,154 @@ static void get_rds_group(RDSEncoder* enc, uint16_t *blocks, uint8_t stream) {
get_rds_lps_group(enc, blocks); get_rds_lps_group(enc, blocks);
goto group_coded; goto group_coded;
} }
group_coded:
return;
}
static uint8_t check_rds_good_group(RDSEncoder* enc, char grp) {
static uint8_t good_group = 0;
if(grp == '0') good_group = 1;
if(grp == '1' && enc->data[enc->program].ecc != 0) good_group = 1;
if(grp == '2' && (enc->data[enc->program].rt1_enabled || enc->data[enc->program].rt2_enabled)) good_group = 1;
if(grp == 'A' && enc->data[enc->program].ptyn_enabled) good_group = 1;
if(grp == 'E') {
for (int i = 0; i < EONS; i++) {
if (enc->data[enc->program].eon[i].enabled) {
good_group = 1;
break;
}
}
}
if(grp == 'X' && enc->data[enc->program].udg1_len != 0) good_group = 1;
if(grp == 'Y' && enc->data[enc->program].udg2_len != 0) good_group = 1;
if(grp == 'R' && enc->rtpData[enc->program].enabled) good_group = 1;
if(grp == '3' && enc->oda_state[enc->program].count != 0) good_group = 1;
if(grp == 'F' && enc->data[enc->program].lps[0] != '\0') good_group = 1;
return good_group;
}
static void get_rds_group(RDSEncoder* enc, uint16_t *blocks, uint8_t stream) {
blocks[0] = enc->data[enc->program].pi;
blocks[1] = 0;
blocks[2] = 0;
blocks[3] = 0;
struct tm *utc;
time_t now;
time(&now);
utc = gmtime(&now);
if (utc->tm_min != enc->state[enc->program].last_minute) {
enc->state[enc->program].last_minute = utc->tm_min;
uint8_t eon_has_ta = 0;
for (int i = 0; i < EONS; i++) {
if (enc->data[enc->program].eon[i].enabled && enc->data[enc->program].eon[i].ta) {
eon_has_ta = 1;
break;
}
}
if(enc->data[enc->program].tp && enc->data[enc->program].ta && enc->state[enc->program].ta_timeout && !eon_has_ta) {
enc->state[enc->program].ta_timeout--;
if(enc->state[enc->program].ta_timeout == 0) {
enc->data[enc->program].ta = 0;
enc->state[enc->program].ta_timeout = enc->state[enc->program].original_ta_timeout;
};
}
if(enc->data[enc->program].rt1_enabled && enc->data[enc->program].rt2_enabled && enc->data[enc->program].rt_switching_period != 0) {
enc->data[enc->program].rt_switching_period--;
if(enc->data[enc->program].rt_switching_period == 0) {
enc->state[enc->program].current_rt ^= 1;
if (enc->state[enc->program].current_rt == 1) {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt2, RT_LENGTH);
} else {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt1, RT_LENGTH);
}
enc->state[enc->program].rt_state = 0;
enc->data[enc->program].rt_switching_period = enc->data[enc->program].orignal_rt_switching_period;
}
}
if(enc->data[enc->program].ct && stream == 0) {
get_rds_ct_group(enc, blocks);
goto group_coded;
}
}
static uint8_t good_group = 0;
static uint8_t cant_find_group = 0;
static char grp;
if(stream != 0) {
blocks[0] = 0;
if(get_rds_custom_groups2(enc, blocks)) {
goto group_coded_rds2;
}
if(enc->encoder_data.rds2_mode == 0) { // tunneling
blocks[1] = enc->state->last_stream0_group[0];
blocks[2] = enc->state->last_stream0_group[1];
blocks[3] = enc->state->last_stream0_group[2];
goto group_coded_rds2;
} else if(enc->encoder_data.rds2_mode == 1) { // independent tunneling
while(good_group == 0) {
uint8_t grp_sqc_idx = enc->state[enc->program].grp_seq_idx[2];
if(enc->data[enc->program].grp_sqc[grp_sqc_idx] == '\0') {
enc->state[enc->program].grp_seq_idx[2] = 0;
grp_sqc_idx = 0;
}
grp = enc->data[enc->program].grp_sqc[grp_sqc_idx];
good_group = check_rds_good_group(enc, grp);
if(!good_group) cant_find_group++;
else cant_find_group = 0;
if(!good_group && cant_find_group == 23) {
cant_find_group = 0;
break;
}
enc->state[enc->program].grp_seq_idx[2]++;
}
if(!good_group) grp = '0';
get_rds_sequence_group(enc, blocks, grp);
goto group_coded_rds2;
}
}
if(get_rds_custom_groups(enc, blocks)) {
goto group_coded;
}
while(good_group == 0) {
uint8_t grp_sqc_idx = enc->state[enc->program].grp_seq_idx[0];
if(enc->data[enc->program].grp_sqc[grp_sqc_idx] == '\0') {
enc->state[enc->program].grp_seq_idx[0] = 0;
grp_sqc_idx = 0;
}
grp = enc->data[enc->program].grp_sqc[grp_sqc_idx];
good_group = check_rds_good_group(enc, grp);
if(!good_group) cant_find_group++;
else cant_find_group = 0;
if(!good_group && cant_find_group == 23) {
cant_find_group = 0;
break;
}
enc->state[enc->program].grp_seq_idx[0]++;
}
if(!good_group) grp = '0';
get_rds_sequence_group(enc, blocks, grp);
group_coded_rds2:
if (blocks[0] == 0 && IS_TYPE_B(blocks)) {
blocks[2] = enc->data[enc->program].pi;
}
return;
group_coded: group_coded:
blocks[1] |= enc->data[enc->program].tp << 10; blocks[1] |= enc->data[enc->program].tp << 10;
@@ -846,4 +880,16 @@ void set_rds_grpseq(RDSEncoder* enc, char *grpseq) {
memset(enc->data[enc->program].grp_sqc, 0, 24); memset(enc->data[enc->program].grp_sqc, 0, 24);
while (*grpseq != 0 && len < 24) enc->data[enc->program].grp_sqc[len++] = *grpseq++; while (*grpseq != 0 && len < 24) enc->data[enc->program].grp_sqc[len++] = *grpseq++;
}
void set_rds_grpseq2(RDSEncoder* enc, char *grpseq2) {
uint8_t len = 0;
if(grpseq2[0] == '\0') {
memset(enc->data[enc->program].grp_sqc_rds2, 0, 24);
memcpy(enc->data[enc->program].grp_sqc_rds2, enc->data[enc->program].grp_sqc, 24);
return;
}
memset(enc->data[enc->program].grp_sqc_rds2, 0, 24);
while (*grpseq2 != 0 && len < 24) enc->data[enc->program].grp_sqc_rds2[len++] = *grpseq2++;
} }

4
src/rds.h
View File

@@ -100,6 +100,7 @@ typedef struct {
char lps[LPS_LENGTH]; char lps[LPS_LENGTH];
char grp_sqc[24]; char grp_sqc[24];
char grp_sqc_rds2[24];
uint8_t udg1_len : 4; uint8_t udg1_len : 4;
uint8_t udg2_len : 4; uint8_t udg2_len : 4;
@@ -139,7 +140,7 @@ typedef struct {
uint16_t custom_group2[GROUP_LENGTH + 1]; uint16_t custom_group2[GROUP_LENGTH + 1];
uint8_t rtp_oda : 1; uint8_t rtp_oda : 1;
uint8_t grp_seq_idx[3]; uint8_t grp_seq_idx[4];
uint8_t udg_idxs[2]; uint8_t udg_idxs[2];
uint8_t last_minute : 6; uint8_t last_minute : 6;
@@ -291,5 +292,6 @@ void set_rds_rtplus_flags(RDSEncoder* enc, uint8_t flags);
void set_rds_rtplus_tags(RDSEncoder* enc, uint8_t *tags); void set_rds_rtplus_tags(RDSEncoder* enc, uint8_t *tags);
void set_rds_ptyn(RDSEncoder* enc, char *ptyn); void set_rds_ptyn(RDSEncoder* enc, char *ptyn);
void set_rds_grpseq(RDSEncoder* enc, char *grpseq); void set_rds_grpseq(RDSEncoder* enc, char *grpseq);
void set_rds_grpseq2(RDSEncoder* enc, char *grpseq2);
#endif #endif