From 737e298fa057056769d34f2107f808ec0886c258 Mon Sep 17 00:00:00 2001
From: KubaPro010 <kuba.pro010@gmail.com>
Date: Thu, 13 Mar 2025 21:30:21 +0100
Subject: [PATCH] refactor RDS handling: remove unused functions and improve
 command parsing

---
 src/ascii_cmd.c | 29 ++++++++++++++---------------
 src/rds.c       |  5 +----
 src/rds.h       |  1 -
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/ascii_cmd.c b/src/ascii_cmd.c
index 76910f0..cfae7ee 100644
--- a/src/ascii_cmd.c
+++ b/src/ascii_cmd.c
@@ -26,6 +26,10 @@ static void handle_afch(unsigned char *arg) {
     if (arg[0] == 'A' || arg[0] == 'B') {
         return;
     }
+    if(arg[0] == '\0') {
+        clear_rds_af();
+        return;
+    }
     
     clear_rds_af();
     uint8_t arg_count;
@@ -60,7 +64,6 @@ static void handle_afch(unsigned char *arg) {
 static void handle_tps(unsigned char *arg) {
     arg[PS_LENGTH * 2] = 0;
     set_rds_tps(xlat(arg));
-    set_rds_tpson(1);
 }
 
 static void handle_rt1(unsigned char *arg) {
@@ -146,6 +149,10 @@ static void handle_af(unsigned char *arg) {
     if (arg[0] == 'A' || arg[0] == 'B') {
         return;
     }
+    if(arg[0] == '\0') {
+        clear_rds_af();
+        return;
+    }
     
     clear_rds_af();
     uint8_t arg_count;
@@ -210,11 +217,6 @@ static void handle_clear_af(unsigned char *arg) {
     clear_rds_af();
 }
 
-static void handle_tps_off(unsigned char *arg) {
-    (void)arg;
-    set_rds_tpson(0);
-}
-
 // Command tables organized by delimiter position and command length
 static const command_handler_t commands_eq3[] = {
     {"PS", handle_ps, 2},
@@ -260,9 +262,6 @@ static const command_handler_t commands_eq7[] = {
 };
 
 static const command_handler_t commands_exact[] = {
-    {"AF=", handle_clear_af, 3},
-    {"TPS=", handle_tps_off, 4},
-    {"AFCH=", handle_clear_af, 5}
 };
 
 // Process a command using the appropriate command table
@@ -292,7 +291,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 2 (format: X=y...)
-    if (cmd_len > 2 && str[1] == '=') {
+    if (cmd_len > 1 && str[1] == '=') {
         cmd = str;
         cmd[1] = 0;
         arg = str + 2;
@@ -305,7 +304,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 3 (format: XX=y...)
-    if (cmd_len > 3 && str[2] == '=') {
+    if (cmd_len > 2 && str[2] == '=') {
         cmd = str;
         cmd[2] = 0;
         arg = str + 3;
@@ -318,7 +317,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 4 (format: XXX=y...)
-    if (cmd_len > 4 && str[3] == '=') {
+    if (cmd_len > 3 && str[3] == '=') {
         cmd = str;
         cmd[3] = 0;
         arg = str + 4;
@@ -331,7 +330,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 5 (format: XXXX=y...)
-    if (cmd_len > 5 && str[4] == '=') {
+    if (cmd_len > 4 && str[4] == '=') {
         cmd = str;
         cmd[4] = 0;
         arg = str + 5;
@@ -344,7 +343,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 6 (format: XXXXX=y...)
-    if (cmd_len > 6 && str[5] == '=') {
+    if (cmd_len > 5 && str[5] == '=') {
         cmd = str;
         cmd[5] = 0;
         arg = str + 6;
@@ -357,7 +356,7 @@ void process_ascii_cmd(unsigned char *str) {
     }
 
     // Process commands with = delimiter at position 7 (format: XXXXXX=y...)
-    if (cmd_len > 7 && str[6] == '=') {
+    if (cmd_len > 6 && str[6] == '=') {
         cmd = str;
         cmd[6] = 0;
         arg = str + 7;
diff --git a/src/rds.c b/src/rds.c
index acd9491..e37f814 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -105,7 +105,7 @@ static void get_rds_ps_group(uint16_t *blocks) {
 	blocks[1] |= ((rds_data.di >> (3 - ps_csegment)) & INT8_0) << 2;
 	blocks[1] |= ps_csegment;
 	blocks[2] = get_next_af();
-	if(rds_data.ta && rds_data.traffic_ps_on) {
+	if(rds_data.ta && tps_text[0]) {
 		blocks[3] = tps_text[ps_csegment * 2] << 8 | tps_text[ps_csegment * 2 + 1];
 	} else {
 		/* TODO: Add DPS */
@@ -500,9 +500,6 @@ void set_rds_ps(unsigned char *ps) {
 	while (*ps != 0 && len < PS_LENGTH)
 		rds_data.ps[len++] = *ps++;
 }
-void set_rds_tpson(uint8_t tpson) {
-	rds_data.traffic_ps_on = tpson & INT8_0;
-}
 void set_rds_tps(unsigned char *tps) {
 	uint8_t len = 0;
 
diff --git a/src/rds.h b/src/rds.h
index 874c469..f0731b6 100644
--- a/src/rds.h
+++ b/src/rds.h
@@ -271,7 +271,6 @@ extern void set_rds_pin(uint8_t day, uint8_t hour, uint8_t minute);
 extern void set_rds_rt1_enabled(uint8_t rt1en);
 extern void set_rds_rt1(unsigned char *rt1);
 extern void set_rds_ps(unsigned char *ps);
-extern void set_rds_tpson(uint8_t tpson);
 extern void set_rds_tps(unsigned char *ps);
 extern void set_rds_lps(unsigned char *lps);
 extern void set_rds_rtplus_flags(uint8_t flags);