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

move enable ptyn from state to data

Browse Source
This commit is contained in:
KubaPro010
2025-03-15 11:55:03 +01:00
parent 10ab93c3f1
commit afdc17146b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ascii_cmd.c
View File

@@ -205,7 +205,7 @@ static void handle_rt1en(unsigned char *arg, RDSModulator* mod) {
static void handle_ptynen(unsigned char *arg, RDSModulator* mod) { static void handle_ptynen(unsigned char *arg, RDSModulator* mod) {
arg[1] = 0; arg[1] = 0;
mod->enc->state[mod->enc->program].ptyn_enabled = strtoul((char *)arg, NULL, 10); mod->enc->data[mod->enc->program].ptyn_enabled = strtoul((char *)arg, NULL, 10);
} }
static void handle_rtprun(unsigned char *arg, RDSModulator* mod) { static void handle_rtprun(unsigned char *arg, RDSModulator* mod) {

4
src/rds.c
View File

@@ -54,7 +54,7 @@ void saveToFile(RDSEncoder *emp, const char *option) {
tempEncoder.state[emp->program].rt_ab = emp->state[emp->program].rt_ab; tempEncoder.state[emp->program].rt_ab = emp->state[emp->program].rt_ab;
} else if (strcmp(option, "PTYN") == 0) { } else if (strcmp(option, "PTYN") == 0) {
memcpy(tempEncoder.data[emp->program].ptyn, emp->data[emp->program].ptyn, PTYN_LENGTH); memcpy(tempEncoder.data[emp->program].ptyn, emp->data[emp->program].ptyn, PTYN_LENGTH);
tempEncoder.state[emp->program].ptyn_enabled = emp->state[emp->program].ptyn_enabled; tempEncoder.data[emp->program].ptyn_enabled = emp->data[emp->program].ptyn_enabled;
tempEncoder.state[emp->program].ptyn_update = emp->state[emp->program].ptyn_update; tempEncoder.state[emp->program].ptyn_update = emp->state[emp->program].ptyn_update;
tempEncoder.state[emp->program].ptyn_ab = emp->state[emp->program].ptyn_ab; tempEncoder.state[emp->program].ptyn_ab = emp->state[emp->program].ptyn_ab;
} else if (strcmp(option, "AF") == 0 || strcmp(option, "AFCH") == 0) { } else if (strcmp(option, "AF") == 0 || strcmp(option, "AFCH") == 0) {
@@ -371,7 +371,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) good_group = 1;
if(grp == 'A' && enc->state[enc->program].ptyn_enabled) good_group = 1; if(grp == 'A' && enc->data[enc->program].ptyn_enabled) good_group = 1;
if(grp == 'X' && enc->data[enc->program].udg1_len != 0) good_group = 1; 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 == 'Y' && enc->data[enc->program].udg2_len != 0) good_group = 1;
if(grp == 'R' && enc->rtpData[enc->program].enabled) good_group = 1; if(grp == 'R' && enc->rtpData[enc->program].enabled) good_group = 1;

2
src/rds.h
View File

@@ -56,6 +56,7 @@ typedef struct {
uint8_t rt1_enabled; uint8_t rt1_enabled;
unsigned char rt1[RT_LENGTH]; unsigned char rt1[RT_LENGTH];
uint8_t ptyn_enabled;
unsigned char ptyn[PTYN_LENGTH]; unsigned char ptyn[PTYN_LENGTH];
RDSAFs af; RDSAFs af;
@@ -92,7 +93,6 @@ typedef struct {
unsigned char ptyn_text[RT_LENGTH]; unsigned char ptyn_text[RT_LENGTH];
uint8_t ptyn_state; uint8_t ptyn_state;
uint8_t ptyn_enabled;
uint8_t ptyn_update; uint8_t ptyn_update;
uint8_t ptyn_ab; uint8_t ptyn_ab;