From afdc17146b068d85585db99cb817e0a4e744cf39 Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Sat, 15 Mar 2025 11:55:03 +0100 Subject: [PATCH] move enable ptyn from state to data --- src/ascii_cmd.c | 2 +- src/rds.c | 4 ++-- src/rds.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ascii_cmd.c b/src/ascii_cmd.c index f9772eb..72ebe9a 100644 --- a/src/ascii_cmd.c +++ b/src/ascii_cmd.c @@ -205,7 +205,7 @@ static void handle_rt1en(unsigned char *arg, RDSModulator* mod) { static void handle_ptynen(unsigned char *arg, RDSModulator* mod) { 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) { diff --git a/src/rds.c b/src/rds.c index f45d684..59fb28f 100644 --- a/src/rds.c +++ b/src/rds.c @@ -54,7 +54,7 @@ void saveToFile(RDSEncoder *emp, const char *option) { tempEncoder.state[emp->program].rt_ab = emp->state[emp->program].rt_ab; } else if (strcmp(option, "PTYN") == 0) { 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_ab = emp->state[emp->program].ptyn_ab; } 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 == '1' && enc->data[enc->program].ecclic_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 == 'Y' && enc->data[enc->program].udg2_len != 0) good_group = 1; if(grp == 'R' && enc->rtpData[enc->program].enabled) good_group = 1; diff --git a/src/rds.h b/src/rds.h index a5ffe68..3bb9488 100644 --- a/src/rds.h +++ b/src/rds.h @@ -56,6 +56,7 @@ typedef struct { uint8_t rt1_enabled; unsigned char rt1[RT_LENGTH]; + uint8_t ptyn_enabled; unsigned char ptyn[PTYN_LENGTH]; RDSAFs af; @@ -92,7 +93,6 @@ typedef struct { unsigned char ptyn_text[RT_LENGTH]; uint8_t ptyn_state; - uint8_t ptyn_enabled; uint8_t ptyn_update; uint8_t ptyn_ab;