From 28b3c5e9be9c88c0e6c4d02174b969577d82885e Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Tue, 25 Mar 2025 17:21:48 +0100 Subject: [PATCH] fix lps --- .vscode/.server-controller-port.log | 2 +- src/rds.c | 8 +------- src/rds.h | 12 ------------ 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.vscode/.server-controller-port.log b/.vscode/.server-controller-port.log index 2b25154..b593016 100644 --- a/.vscode/.server-controller-port.log +++ b/.vscode/.server-controller-port.log @@ -1,5 +1,5 @@ { "port": 13452, - "time": 1742904021409, + "time": 1742919666758, "version": "0.0.3" } \ No newline at end of file diff --git a/src/rds.c b/src/rds.c index 945f469..1ea0108 100644 --- a/src/rds.c +++ b/src/rds.c @@ -826,18 +826,12 @@ void set_rds_lps(RDSEncoder* enc, char *lps) { memset(enc->data[enc->program].lps, 0, LPS_LENGTH); return; } - memset(enc->data[enc->program].lps, ' ', LPS_LENGTH); + memset(enc->data[enc->program].lps, '\r', LPS_LENGTH); while (*lps != 0 && len < LPS_LENGTH) enc->data[enc->program].lps[len++] = *lps++; - while (len > 0 && enc->data[enc->program].lps[len - 1] == ' ') { - len--; - } - if (len < LPS_LENGTH) { enc->state[enc->program].lps_segments = 0; - enc->data[enc->program].lps[len++] = '\r'; - while (i < len) { i += 4; enc->state[enc->program].lps_segments++; diff --git a/src/rds.h b/src/rds.h index 09af6c0..fb9dfaa 100644 --- a/src/rds.h +++ b/src/rds.h @@ -235,26 +235,16 @@ typedef struct { #define GROUP_VER_A 0 #define GROUP_VER_B 1 -#define GROUP_0A (GROUP_TYPE_0 | GROUP_VER_A) -#define GROUP_1A (GROUP_TYPE_1 | GROUP_VER_A) -#define GROUP_2A (GROUP_TYPE_2 | GROUP_VER_A) -#define GROUP_3A (GROUP_TYPE_3 | GROUP_VER_A) -#define GROUP_4A (GROUP_TYPE_4 | GROUP_VER_A) #define GROUP_5A (GROUP_TYPE_5 | GROUP_VER_A) #define GROUP_6A (GROUP_TYPE_6 | GROUP_VER_A) #define GROUP_7A (GROUP_TYPE_7 | GROUP_VER_A) #define GROUP_8A (GROUP_TYPE_8 | GROUP_VER_A) #define GROUP_9A (GROUP_TYPE_9 | GROUP_VER_A) -#define GROUP_10A (GROUP_TYPE_10 | GROUP_VER_A) #define GROUP_11A (GROUP_TYPE_11 | GROUP_VER_A) #define GROUP_12A (GROUP_TYPE_12 | GROUP_VER_A) #define GROUP_13A (GROUP_TYPE_13 | GROUP_VER_A) -#define GROUP_14A (GROUP_TYPE_14 | GROUP_VER_A) -#define GROUP_15A (GROUP_TYPE_15 | GROUP_VER_A) -#define GROUP_0B (GROUP_TYPE_0 | GROUP_VER_B) #define GROUP_1B (GROUP_TYPE_1 | GROUP_VER_B) -#define GROUP_2B (GROUP_TYPE_2 | GROUP_VER_B) #define GROUP_3B (GROUP_TYPE_3 | GROUP_VER_B) #define GROUP_4B (GROUP_TYPE_4 | GROUP_VER_B) #define GROUP_5B (GROUP_TYPE_5 | GROUP_VER_B) @@ -266,8 +256,6 @@ typedef struct { #define GROUP_11B (GROUP_TYPE_11 | GROUP_VER_B) #define GROUP_12B (GROUP_TYPE_12 | GROUP_VER_B) #define GROUP_13B (GROUP_TYPE_13 | GROUP_VER_B) -#define GROUP_14B (GROUP_TYPE_14 | GROUP_VER_B) -#define GROUP_15B (GROUP_TYPE_15 | GROUP_VER_B) #define GET_GROUP_TYPE(x) ((x >> 4) & 15) #define GET_GROUP_VER(x) (x & 1)