gps: add ValueError and test for invalid msg

robotika · Jun 19, 2024 · 16c764a · 16c764a
1 parent ee57b13
commit 16c764a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/osgar/drivers/gps.py b/osgar/drivers/gps.py
@@ -26,7 +26,7 @@ def str2deg(s):
     dm, frac = ('0000' + s).split('.')
     try:
         return float(dm[:-2]) + float(dm[-2:] + '.' + frac) / 60
-    except Exception as e:
+    except ValueError as e:
         print(e)
         return None
 
@@ -62,7 +62,7 @@ def parse_nmea(line):
         nmea_data["age"] = None if nmea_list[13] == "" else float(nmea_list[13])
         stn_id = nmea_list[14].split("*")[0]
         nmea_data["stn_id"] = None if stn_id == "" else stn_id
-    except Exception as e:
+    except ValueError as e:
         print(e)
         return None
 

diff --git a/osgar/drivers/test_gps.py b/osgar/drivers/test_gps.py
@@ -100,4 +100,9 @@ def test_parse_old_GPGGA(self):
         nmea_data = gps.parse_nmea(line)
         self.assertEqual(nmea_data["lon"], 14.5056)
         self.assertEqual(nmea_data["lat"], 50.08374)
+
+    def test_parse_err_line(self):
+        line = b'$GPGGA,051852.000,5005.0244,N,01430.3360,E,1,06,3.8,253\x00.1,M,45.4,M,,0000*58'
+        self.assertIsNone(gps.parse_nmea(line))
+
 # vim: expandtab sw=4 ts=4