From 9ac22488ddbd7e480cd5ce9c2fabf301b54cd03f Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Fri, 28 Mar 2025 20:36:22 +0100 Subject: [PATCH] nice --- src/rds.c | 14 +++++++------- src/rds.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rds.c b/src/rds.c index 1cf77ff..e26fc7a 100644 --- a/src/rds.c +++ b/src/rds.c @@ -336,8 +336,8 @@ static void get_rds_lps_group(RDSEncoder* enc, uint16_t *blocks) { blocks[3] = enc->state[enc->program].lps_text[enc->state[enc->program].lps_state * 4 + 2] << 8; blocks[3] |= enc->state[enc->program].lps_text[enc->state[enc->program].lps_state * 4 + 3]; - if (enc->state[enc->program].lps_state == enc->state[enc->program].lps_segments) enc->state[enc->program].lps_state = 0; enc->state[enc->program].lps_state++; + if (enc->state[enc->program].lps_state == enc->state[enc->program].lps_segments) enc->state[enc->program].lps_state = 0; } static void get_rds_ecc_group(RDSEncoder* enc, uint16_t *blocks) { @@ -764,10 +764,10 @@ void set_rds_rt1(RDSEncoder* enc, char *rt1) { while (i < len) { i += 4; - if (i != 4) enc->state[enc->program].rt_segments++; + enc->state[enc->program].rt_segments++; } } else { - enc->state[enc->program].rt_segments = 15; + enc->state[enc->program].rt_segments = 16; } } @@ -790,10 +790,10 @@ void set_rds_rt2(RDSEncoder* enc, char *rt2) { while (i < len) { i += 4; - if (i != 4) enc->state[enc->program].rt2_segments++; + enc->state[enc->program].rt2_segments++; } } else { - enc->state[enc->program].rt2_segments = 15; + enc->state[enc->program].rt2_segments = 16; } } @@ -834,10 +834,10 @@ void set_rds_lps(RDSEncoder* enc, char *lps) { while (i < len) { i += 4; - if (i != 4) enc->state[enc->program].lps_segments++; + enc->state[enc->program].lps_segments++; } } else { - enc->state[enc->program].lps_segments = 7; + enc->state[enc->program].lps_segments = 8; } } diff --git a/src/rds.h b/src/rds.h index 4a78060..66f734b 100644 --- a/src/rds.h +++ b/src/rds.h @@ -114,12 +114,12 @@ typedef struct { uint8_t ps_csegment : 3; char rt_text[RT_LENGTH]; - uint8_t rt_state : 4; + uint8_t rt_state : 5; uint8_t rt_update : 1; uint8_t rt2_update : 1; uint8_t rt_ab : 1; - uint8_t rt_segments : 4; - uint8_t rt2_segments : 4; + uint8_t rt_segments : 5; + uint8_t rt2_segments : 5; uint8_t current_rt : 1; char ert_text[ERT_LENGTH]; @@ -131,9 +131,9 @@ typedef struct { uint8_t ptyn_ab : 1; char lps_text[LPS_LENGTH]; - uint8_t lps_state : 3; + uint8_t lps_state : 4; uint8_t lps_update : 1; - uint8_t lps_segments : 3; + uint8_t lps_segments : 4; uint16_t custom_group[GROUP_LENGTH]; uint16_t custom_group2[GROUP_LENGTH + 1];