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

fix rt2 logic

Browse Source
This commit is contained in:
KubaPro010
2025-03-22 17:55:30 +01:00
parent 739c320895
commit a32bb193f6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rds.c
View File

@@ -308,14 +308,14 @@ encode:
} }
static void get_rds_rt_group(RDSEncoder* enc, uint16_t *blocks) { static void get_rds_rt_group(RDSEncoder* enc, uint16_t *blocks) {
if (enc->state[enc->program].rt_update && enc->data[enc->program].rt1_enabled) { if (enc->state[enc->program].rt_update && enc->data[enc->program].rt1_enabled && enc->state[enc->program].current_rt) {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt1, RT_LENGTH); memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt1, RT_LENGTH);
enc->state[enc->program].rt_ab ^= 1; enc->state[enc->program].rt_ab ^= 1;
enc->state[enc->program].rt_update = 0; enc->state[enc->program].rt_update = 0;
enc->state[enc->program].rt_state = 0; enc->state[enc->program].rt_state = 0;
enc->state[enc->program].current_rt = 0; enc->state[enc->program].current_rt = 0;
} }
if(enc->state[enc->program].rt2_update && enc->data[enc->program].rt2_enabled && !enc->data[enc->program].rt1_enabled) { if(enc->state[enc->program].rt2_update && enc->data[enc->program].rt2_enabled && !enc->state[enc->program].current_rt) {
memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt2, RT_LENGTH); memcpy(enc->state[enc->program].rt_text, enc->data[enc->program].rt2, RT_LENGTH);
enc->state[enc->program].rt_ab ^= 1; enc->state[enc->program].rt_ab ^= 1;
enc->state[enc->program].rt2_update = 0; enc->state[enc->program].rt2_update = 0;
@@ -601,7 +601,7 @@ static void get_rds_group(RDSEncoder* enc, uint16_t *blocks) {
if(grp == '0') good_group = 1; if(grp == '0') good_group = 1;
if(grp == '1' && enc->data[enc->program].ecclic_enabled) good_group = 1; if(grp == '1' && enc->data[enc->program].ecclic_enabled) good_group = 1;
if(grp == '2' && enc->data[enc->program].rt1_enabled) 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 == 'A' && enc->data[enc->program].ptyn_enabled) good_group = 1;
if(grp == 'E') { if(grp == 'E') {
for (int i = 0; i < EONS; i++) { for (int i = 0; i < EONS; i++) {