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

Enhance RDS handling by adding RTP state toggling and improving command parsing

Browse Source
This commit is contained in:
KubaPro010
2025-03-22 19:10:26 +01:00
parent 40898eaca3
commit 07b0a3c91c
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ascii_cmd.c
View File

@@ -278,7 +278,13 @@ static void handle_ptynen(char *arg, RDSModulator* mod, char* output) {
}
static void handle_rtprun(char *arg, RDSModulator* mod, char* output) {
set_rds_rtplus_flags(mod->enc, atoi(arg));
int flag1, flag2;
if (sscanf(arg, "%d,%d", &flag1, &flag2) == 2) {
set_rds_rtplus_flags(mod->enc, flag1);
if(flag2) mod->enc->rtpState[mod->enc->program].toggle ^= 1;
} else {
set_rds_rtplus_flags(mod->enc, atoi(arg));
}
strcpy(output, "+\0");
}

4
src/control_pipe.c
View File

@@ -31,7 +31,7 @@ void poll_control_pipe(RDSModulator* mod) {
if (bytes_read <= 0) return;
token = strtok((char *)pipe_buf, "\r\n");
if(token == NULL) token = strtok((char *)pipe_buf, "\x1A");
if(token == NULL) token = strtok((char *)pipe_buf, "\r");
while (token != NULL) {
size_t cmd_len = strlen(token);
if (cmd_len > 0 && cmd_len < CMD_BUFFER_SIZE) {
@@ -40,7 +40,7 @@ void poll_control_pipe(RDSModulator* mod) {
process_ascii_cmd(mod, cmd_buf);
}
token = strtok(NULL, "\r\n");
if(token == NULL) token = strtok(NULL, "\x1A");
if(token == NULL) token = strtok(NULL, "\r");
}
}

11
src/rds.c
View File

@@ -367,6 +367,14 @@ static void get_rds_oda_group(RDSEncoder* enc, uint16_t *blocks) {
if (enc->oda_state[enc->program].current >= enc->oda_state[enc->program].count) enc->oda_state[enc->program].current = 0;
}
static void get_rds_rtp_oda_group(RDSEncoder* enc, uint16_t *blocks) {
blocks[1] |= 3 << 12;
blocks[1] |= GET_GROUP_TYPE(enc->rtpData[enc->program].group) << 1;
blocks[1] |= GET_GROUP_VER(enc->rtpData[enc->program].group);
blocks[3] = ODA_AID_RTPLUS;
}
static void get_rds_ct_group(RDSEncoder* enc, uint16_t *blocks) {
(void)enc;
struct tm *utc, *local_time;
@@ -696,7 +704,7 @@ static void get_rds_group(RDSEncoder* enc, uint16_t *blocks) {
if(enc->state[enc->program].rtp_oda == 0) {
get_rds_rtplus_group(enc, blocks);
} else {
get_rds_oda_group(enc, blocks);
get_rds_rtp_oda_group(enc, blocks);
}
enc->state[enc->program].rtp_oda ^= 1;
goto group_coded;
@@ -725,7 +733,6 @@ void get_rds_bits(RDSEncoder* enc, uint8_t *bits) {
}
static void init_rtplus(RDSEncoder* enc, uint8_t group, uint8_t program) {
register_oda(enc, group, ODA_AID_RTPLUS, 0);
enc->rtpData[program].group = group;
enc->rtpData[program].enabled = 0;
}

9
src/rds.h
View File

@@ -142,9 +142,6 @@ typedef struct {
uint16_t udg2[8][3];
RDSEON eon[EONS];
RDSMessages messages;
RDSScheduler schedule;
} RDSData;
typedef struct {
uint8_t ecc_or_lic : 1;
@@ -194,7 +191,7 @@ typedef struct {
uint16_t custom_group[GROUP_LENGTH];
uint8_t rtp_oda : 1;
uint8_t grp_seq_idx[2];
uint8_t grp_seq_idx[3];
uint8_t udg_idxs[2];
uint8_t last_minute : 6;
@@ -241,6 +238,10 @@ typedef struct {
uint16_t site_addr[2];
RDSEncoderASCIIData ascii_data;
RDSEncoderUECPData uecp_data;
uint16_t special_features;
RDSScheduler schedule;
RDSMessages messages;
// uint8_t rds2_buffer[16384];
} RDSEncoderData;
typedef struct {
RDSEncoderData encoder_data[PROGRAMS];