radio95/rds95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-07-30 08:49:15 +02:00
Code Issues Wiki Activity

wow

Browse Source
This commit is contained in:
kuba
2025-03-17 20:18:49 +01:00
parent 5b3739e1ea
commit 1c7e8936de
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.c
+24 -24
View File
@@ -8,7 +8,7 @@ void saveToFile(RDSEncoder *emp, const char *option) {
char encoderPath[256]; char encoderPath[256];
snprintf(encoderPath, sizeof(encoderPath), "%s/.rdsEncoder", getenv("HOME")); snprintf(encoderPath, sizeof(encoderPath), "%s/.rdsEncoder", getenv("HOME"));
FILE *file; FILE *file;
RDSEncoder tempEncoder; RDSEncoder tempEncoder;
file = fopen(encoderPath, "rb"); file = fopen(encoderPath, "rb");
if (file != NULL) { if (file != NULL) {
@@ -17,7 +17,7 @@ void saveToFile(RDSEncoder *emp, const char *option) {
} else { } else {
memcpy(&tempEncoder, emp, sizeof(RDSEncoder)); memcpy(&tempEncoder, emp, sizeof(RDSEncoder));
} }
if (strcmp(option, "MS") == 0) { if (strcmp(option, "MS") == 0) {
tempEncoder.data[emp->program].ms = emp->data[emp->program].ms; tempEncoder.data[emp->program].ms = emp->data[emp->program].ms;
} else if (strcmp(option, "PS") == 0) { } else if (strcmp(option, "PS") == 0) {
@@ -122,7 +122,7 @@ void saveToFile(RDSEncoder *emp, const char *option) {
memcpy(&(rdsEncoderfile.oda_state[emp->program]), &(tempEncoder.oda_state[emp->program]), sizeof(RDSODAState)); memcpy(&(rdsEncoderfile.oda_state[emp->program]), &(tempEncoder.oda_state[emp->program]), sizeof(RDSODAState));
memcpy(&(rdsEncoderfile.encoder_data[emp->program]), &(tempEncoder.encoder_data[emp->program]), sizeof(RDSODAState)); memcpy(&(rdsEncoderfile.encoder_data[emp->program]), &(tempEncoder.encoder_data[emp->program]), sizeof(RDSODAState));
rdsEncoderfile.program = tempEncoder.program; rdsEncoderfile.program = tempEncoder.program;
file = fopen(encoderPath, "wb"); file = fopen(encoderPath, "wb");
if (file == NULL) { if (file == NULL) {
perror("Error opening file"); perror("Error opening file");
@@ -214,22 +214,22 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH); memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH);
enc->state[enc->program].ps_update = 0; enc->state[enc->program].ps_update = 0;
} }
if(enc->state[enc->program].tps_update) { if(enc->state[enc->program].tps_update) {
memcpy(enc->state[enc->program].tps_text, enc->data[enc->program].tps, PS_LENGTH); memcpy(enc->state[enc->program].tps_text, enc->data[enc->program].tps, PS_LENGTH);
enc->state[enc->program].tps_update = 0; enc->state[enc->program].tps_update = 0;
} }
if(enc->state[enc->program].dps1_update && dps1_on) { if(enc->state[enc->program].dps1_update && dps1_on) {
memcpy(enc->state[enc->program].dps1_text, enc->data[enc->program].dps1, DPS_LENGTH); memcpy(enc->state[enc->program].dps1_text, enc->data[enc->program].dps1, DPS_LENGTH);
enc->state[enc->program].dps1_update = 0; enc->state[enc->program].dps1_update = 0;
enc->state[enc->program].dps1_repeat_count = 0; enc->state[enc->program].dps1_repeat_count = 0;
} }
if(dps1_on) { if(dps1_on) {
if(enc->state[enc->program].dynamic_ps_state == 0) { if(enc->state[enc->program].dynamic_ps_state == 0) {
memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH); memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH);
if(enc->state[enc->program].static_ps_period >= enc->data[enc->program].static_ps_period) { if(enc->state[enc->program].static_ps_period >= enc->data[enc->program].static_ps_period) {
enc->state[enc->program].dynamic_ps_state = 1; enc->state[enc->program].dynamic_ps_state = 1;
enc->state[enc->program].static_ps_period = 0; enc->state[enc->program].static_ps_period = 0;
@@ -237,7 +237,21 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
} }
} else { } else {
if(enc->data[enc->program].dps1_len > PS_LENGTH) { if(enc->data[enc->program].dps1_len > PS_LENGTH) {
uint8_t scroll_threshold = (enc->data[enc->program].dps_speed == 0) ? 6 : 4; if(enc->state[enc->program].dynamic_ps_position >= enc->data[enc->program].dps1_len) {
enc->state[enc->program].dynamic_ps_position = 0;
enc->state[enc->program].dps1_repeat_count++;
if(enc->state[enc->program].dps1_repeat_count >= enc->data[enc->program].dps1_numberofrepeats) {
enc->state[enc->program].dynamic_ps_state = 0;
enc->state[enc->program].dynamic_ps_period = 0;
enc->state[enc->program].dps1_repeat_count = 0;
enc->state[enc->program].dynamic_ps_scroll_counter = 0;
enc->state[enc->program].static_ps_period = 0;
memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH);
}
}
uint8_t scroll_threshold = (enc->data[enc->program].dps_speed == 0) ? 4 : 2;
if(enc->state[enc->program].dynamic_ps_scroll_counter >= scroll_threshold) { if(enc->state[enc->program].dynamic_ps_scroll_counter >= scroll_threshold) {
switch(enc->data[enc->program].dps1_mode) { switch(enc->data[enc->program].dps1_mode) {
@@ -254,24 +268,10 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
} else { } else {
enc->state[enc->program].dynamic_ps_scroll_counter++; enc->state[enc->program].dynamic_ps_scroll_counter++;
} }
if(enc->state[enc->program].dynamic_ps_position >= enc->data[enc->program].dps1_len) {
enc->state[enc->program].dynamic_ps_position = 0;
enc->state[enc->program].dps1_repeat_count++;
if(enc->state[enc->program].dps1_repeat_count >= enc->data[enc->program].dps1_numberofrepeats) {
enc->state[enc->program].dynamic_ps_state = 0;
enc->state[enc->program].dynamic_ps_period = 0;
enc->state[enc->program].dps1_repeat_count = 0;
enc->state[enc->program].dynamic_ps_scroll_counter = 0;
enc->state[enc->program].static_ps_period = 0;
memcpy(enc->state[enc->program].ps_text, enc->data[enc->program].ps, PS_LENGTH);
}
}
} else { } else {
memcpy(enc->state[enc->program].ps_text, enc->state[enc->program].dps1_text, PS_LENGTH); memcpy(enc->state[enc->program].ps_text, enc->state[enc->program].dps1_text, PS_LENGTH);
enc->state[enc->program].dynamic_ps_period++; enc->state[enc->program].dynamic_ps_period++;
if(enc->state[enc->program].dynamic_ps_period >= enc->data[enc->program].dps_label_period) { if(enc->state[enc->program].dynamic_ps_period >= enc->data[enc->program].dps_label_period) {
enc->state[enc->program].dynamic_ps_state = 0; enc->state[enc->program].dynamic_ps_state = 0;
enc->state[enc->program].dynamic_ps_period = 0; enc->state[enc->program].dynamic_ps_period = 0;
@@ -693,7 +693,7 @@ void set_rds_dps1(RDSEncoder* enc, char *dps1) {
memset(enc->data[enc->program].dps1, ' ', DPS_LENGTH); memset(enc->data[enc->program].dps1, ' ', DPS_LENGTH);
while (*dps1 != 0 && len < DPS_LENGTH) enc->data[enc->program].dps1[len++] = *dps1++; while (*dps1 != 0 && len < DPS_LENGTH) enc->data[enc->program].dps1[len++] = *dps1++;
enc->data[enc->program].dps1_len = len; enc->data[enc->program].dps1_len = len;
enc->state[enc->program].dynamic_ps_position = 0; enc->state[enc->program].dynamic_ps_position = 0;
enc->state[enc->program].dynamic_ps_period = 0; enc->state[enc->program].dynamic_ps_period = 0;
enc->state[enc->program].static_ps_period = 0; enc->state[enc->program].static_ps_period = 0;