Account for telemetry with spaces after commas

Technically invalid, but we should try and parse them anyway
as it's just whitespace.

Author: hemna

aprslib/parsing/telemetry.py

@@ -69,15 +69,23 @@ def parse_telemetry_config(body):
             teqns = [0, 1, 0] * 5
 
             for idx, val in enumerate(eqns):
-                if not re.match(r"^([-]?\d*\.?\d+|)$", val):
+                # Strip whitespace from values (some packets have spaces after commas)
+                val = val.strip()
+                # Extract numeric part if there are non-numeric characters (e.g., "03n" -> "03")
+                # This handles cases where comments or extra data are concatenated
+                numeric_match = re.match(r'^([-]?\d*\.?\d+)', val)
+                if numeric_match:
+                    val = numeric_match.group(1)
+                elif not re.match(r"^([-]?\d*\.?\d+|)$", val):
                     raise ParseError("value at %d is not a number in %s" % (idx+1, form))
-                else:
-                    try:
-                        val = int(val)
-                    except:
-                        val = float(val) if val != "" else 0
 
-                    teqns[idx] = val
+                # Convert to number
+                try:
+                    val = int(val)
+                except:
+                    val = float(val) if val != "" else 0
+
+                teqns[idx] = val
 
             # group values in 5 list of 3
             teqns = [teqns[i*3:(i+1)*3] for i in range(5)]
@@ -191,17 +199,28 @@ def parse_telemetry_report(body):
 
     # Parse analog values (can be 000-999, allow decimals and negatives per APRS 1.2)
     # Empty values are allowed and treated as 0
+    # Some packets have data extensions concatenated (e.g., "0>/A=9125")
     analog_vals = []
     for i, val_str in enumerate(analog_strs):
         # Allow empty values (treated as 0)
         if not val_str or val_str.strip() == '':
             analog_vals.append(0.0)
             continue
 
-        # Allow integers, decimals, and negative numbers
-        # Also allow values starting with decimal point (e.g., .10 = 0.10)
-        if not re.match(r'^-?(\d+\.?\d*|\.\d+)$', val_str):
+        # Extract numeric part if there are non-numeric characters (e.g., "0>/A=9125" -> "0")
+        # This handles cases where data extensions are concatenated without proper separation
+        original_val_str = val_str
+        numeric_match = re.match(r'^-?(\d+\.?\d*|\.\d+)', val_str)
+        if numeric_match:
+            numeric_part = numeric_match.group(0)
+            remaining = val_str[len(numeric_part):]
+            val_str = numeric_part
+            # If there's remaining content (like "/A=9125"), add it to comment
+            if remaining and not comment:
+                comment = remaining
+        elif not re.match(r'^-?(\d+\.?\d*|\.\d+)$', val_str):
             raise ParseError("telemetry analog value %d has invalid format" % (i+1))
+        
         try:
             val = float(val_str)
         except ValueError:

tests/test_parse_telemetry.py

@@ -274,6 +274,20 @@ def test_valid_telemetry_leading_decimal_analog_value(self):
         self.assertEqual(result['telemetry']['vals'], [0.1, 12.83, 12.19, 14.0, 14.8])
         self.assertEqual(result['telemetry']['bits'], '00000000')
 
+    def test_valid_telemetry_analog_value_with_data_extension(self):
+        """Test telemetry packet with data extension concatenated to analog value (real-world packet)"""
+        packet = "IZ1DNG-10>WIDE1-1,WIDE2-2,qAR,IR1UFB:T#8,205,114,170,115,0>/A=9125"
+        result = parse(packet)
+
+        self.assertEqual(result['format'], 'telemetry')
+        self.assertEqual(result['telemetry']['seq'], 8)
+        # Analog value 5 is "0>/A=9125" - should extract "0" and preserve "/A=9125" in comment
+        self.assertEqual(result['telemetry']['vals'], [205.0, 114.0, 170.0, 115.0, 0.0])
+        self.assertEqual(result['telemetry']['bits'], '00000000')
+        # The data extension should be preserved in comment
+        self.assertIn('comment', result)
+        self.assertIn('/A=9125', result['comment'])
+
     def test_parse_telemetry_report_function_direct(self):
         """Test parse_telemetry_report function directly"""
         body = "#123,456,789,012,345,678,11001010,Test"

tests/test_parse_telemetry_config.py

@@ -108,6 +108,32 @@ def test_parse_telemetry_config_eqns(self):
         self.assertIsInstance(result['tEQNS'], list)
         self.assertEqual(len(result['tEQNS']), 5)
 
+    def test_parse_telemetry_config_eqns_with_spaces(self):
+        """Test EQNS telemetry config with spaces after commas (real-world packet)"""
+        packet = "IZ6RND>IESPX,TCPIP*,qAC,T2NL::IZ6RND   :EQNS.0,0.392,-20, 0,0.235,0, 0,0.1,0, 0,1,0, 0,1,0"
+        result = parse(packet)
+
+        self.assertEqual(result['format'], 'telemetry-message')
+        self.assertIn('tEQNS', result)
+        self.assertIsInstance(result['tEQNS'], list)
+        self.assertEqual(len(result['tEQNS']), 5)
+        # Verify the values are correctly parsed (spaces should be stripped)
+        expected = [[0, 0.392, -20], [0, 0.235, 0], [0, 0.1, 0], [0, 1, 0], [0, 1, 0]]
+        self.assertEqual(result['tEQNS'], expected)
+
+    def test_parse_telemetry_config_eqns_with_non_numeric_suffix(self):
+        """Test EQNS telemetry config with non-numeric characters in last value (real-world packet)"""
+        packet = "DB0PBG-5>APMI03,DB0OL-10*,WIDE2-1,qAR,DB0PDF-10::DB0PBG-5 :EQNS.0,0.075,0,0,0.5,-64,0,10,0,0,1,0,0,0,03n"
+        result = parse(packet)
+
+        self.assertEqual(result['format'], 'telemetry-message')
+        self.assertIn('tEQNS', result)
+        self.assertIsInstance(result['tEQNS'], list)
+        self.assertEqual(len(result['tEQNS']), 5)
+        # Verify the values are correctly parsed (03n should be parsed as 3)
+        expected = [[0, 0.075, 0], [0, 0.5, -64], [0, 10, 0], [0, 1, 0], [0, 0, 3]]
+        self.assertEqual(result['tEQNS'], expected)
+
     def test_bits_without_binary_bits(self):
         """Test BITS telemetry config without binary bits (malformed packet)"""
         packet = "E25HML-13>APRS,TCPIP*,qAC,T2PERTH::E25HML-13:BITS.ESP8266 Test WX DHT22 version"