From 3abefbf908a4ffd18d5ef408614167c52860e51e Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Fri, 14 Mar 2025 17:24:02 +0100 Subject: [PATCH] move the grp_seq idx to the rds_state thing --- src/rds.c | 19 ++++++++++--------- src/rds.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/rds.c b/src/rds.c index 019699b..e18471f 100644 --- a/src/rds.c +++ b/src/rds.c @@ -29,6 +29,7 @@ static struct { uint16_t custom_group[GROUP_LENGTH]; uint8_t rtp_oda; + uint8_t grp_seq_idx[2]; } rds_state; // #region ODA @@ -300,12 +301,12 @@ static void get_rds_group(uint16_t *blocks) { char grp; while(good_group == 0) { - uint8_t grp_sqc_idx = rds_data.grp_sqc[0]++; - if(rds_data.grp_sqc[grp_sqc_idx+2] == '\0') { - rds_data.grp_sqc[0] = 0; + uint8_t grp_sqc_idx = rds_state.grp_seq_idx[0]++; + if(rds_data.grp_sqc[grp_sqc_idx] == '\0') { + rds_state.grp_seq_idx[0] = 0; grp_sqc_idx = 0; } - grp = rds_data.grp_sqc[grp_sqc_idx+2]; + grp = rds_data.grp_sqc[grp_sqc_idx]; if(grp == '0') good_group = 1; if(grp == '1' && rds_state.ecclic_enabled) good_group = 1; @@ -328,9 +329,9 @@ static void get_rds_group(uint16_t *blocks) { { default: case '0': - if(rds_data.grp_sqc[1] != 3) rds_data.grp_sqc[0]--; - else rds_data.grp_sqc[1] = 0; - rds_data.grp_sqc[1]++; + if(rds_state.grp_seq_idx[1] != 3) rds_state.grp_seq_idx[0]--; + else rds_state.grp_seq_idx[1] = 0; + rds_state.grp_seq_idx[1]++; get_rds_ps_group(blocks); goto group_coded; case '1': @@ -600,7 +601,7 @@ void set_rds_cg(uint16_t* blocks) { void set_rds_grpseq(unsigned char* grpseq) { uint8_t len = 0; - memset(rds_data.grp_sqc+2, ' ', 24); + memset(rds_data.grp_sqc, ' ', 24); while (*grpseq != 0 && len < 24) - rds_data.grp_sqc[2+len++] = *grpseq++; + rds_data.grp_sqc[len++] = *grpseq++; } \ No newline at end of file diff --git a/src/rds.h b/src/rds.h index 3ebe7bc..62b4ab0 100644 --- a/src/rds.h +++ b/src/rds.h @@ -58,7 +58,7 @@ typedef struct rds_params_t { uint8_t pin[4]; - unsigned char grp_sqc[26]; + unsigned char grp_sqc[24]; } rds_params_t; #define GROUP_TYPE_0 ( 0 << 4)