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

move the grp_seq idx to the rds_state thing

Browse Source
This commit is contained in:
kuba
2025-03-14 17:24:02 +01:00
parent c19650e728
commit 3abefbf908
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.c
+10 -9
View File
@@ -29,6 +29,7 @@ static struct {
uint16_t custom_group[GROUP_LENGTH]; uint16_t custom_group[GROUP_LENGTH];
uint8_t rtp_oda; uint8_t rtp_oda;
uint8_t grp_seq_idx[2];
} rds_state; } rds_state;
// #region ODA // #region ODA
@@ -300,12 +301,12 @@ static void get_rds_group(uint16_t *blocks) {
char grp; char grp;
while(good_group == 0) { while(good_group == 0) {
uint8_t grp_sqc_idx = rds_data.grp_sqc[0]++; uint8_t grp_sqc_idx = rds_state.grp_seq_idx[0]++;
if(rds_data.grp_sqc[grp_sqc_idx+2] == '\0') { if(rds_data.grp_sqc[grp_sqc_idx] == '\0') {
rds_data.grp_sqc[0] = 0; rds_state.grp_seq_idx[0] = 0;
grp_sqc_idx = 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 == '0') good_group = 1;
if(grp == '1' && rds_state.ecclic_enabled) 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: default:
case '0': case '0':
if(rds_data.grp_sqc[1] != 3) rds_data.grp_sqc[0]--; if(rds_state.grp_seq_idx[1] != 3) rds_state.grp_seq_idx[0]--;
else rds_data.grp_sqc[1] = 0; else rds_state.grp_seq_idx[1] = 0;
rds_data.grp_sqc[1]++; rds_state.grp_seq_idx[1]++;
get_rds_ps_group(blocks); get_rds_ps_group(blocks);
goto group_coded; goto group_coded;
case '1': case '1':
@@ -600,7 +601,7 @@ void set_rds_cg(uint16_t* blocks) {
void set_rds_grpseq(unsigned char* grpseq) { void set_rds_grpseq(unsigned char* grpseq) {
uint8_t len = 0; uint8_t len = 0;
memset(rds_data.grp_sqc+2, ' ', 24); memset(rds_data.grp_sqc, ' ', 24);
while (*grpseq != 0 && len < 24) while (*grpseq != 0 && len < 24)
rds_data.grp_sqc[2+len++] = *grpseq++; rds_data.grp_sqc[len++] = *grpseq++;
} }
src/rds.h
+1 -1
View File
@@ -58,7 +58,7 @@ typedef struct rds_params_t {
uint8_t pin[4]; uint8_t pin[4];
unsigned char grp_sqc[26]; unsigned char grp_sqc[24];
} rds_params_t; } rds_params_t;
#define GROUP_TYPE_0 ( 0 << 4) #define GROUP_TYPE_0 ( 0 << 4)