update gsv_data handling for NAV-SVINFO & PUBX003

Author: semuadmin

src/pygpsclient/levelsview_frame.py

@@ -159,9 +159,9 @@ def update_frame(self):
         data = self.__app.gnss_status.gsv_data
         show_unused = self.__app.configuration.get("unusedsat_b")
         siv = len(data)
-        if siv == 0:
-            return
         siv = siv if show_unused else siv - unused_sats(data)
+        if siv <= 0:
+            return
 
         w, h = self.width, self.height
         self.init_frame()

src/pygpsclient/nmea_handler.py

@@ -46,8 +46,6 @@ def __init__(self, app):
 
         self._raw_data = None
         self._parsed_data = None
-        # Holds array of current satellites in view from NMEA GSV sentences
-        self.gsv_data = {}
 
     def process_data(self, raw_data: bytes, parsed_data: object):
         """
@@ -304,8 +302,7 @@ def _process_UBX03(self, data: NMEAMessage):
         """
         # pylint: disable=consider-using-dict-items
 
-        show_unused = self.__app.configuration.get("unusedsat_b")
-        self.gsv_data = {}
+        self.__app.gnss_status.gsv_data = {}
         now = time()
         for i in range(data.numSv):
             idx = f"_{i+1:02d}"
@@ -321,8 +318,6 @@ def _process_UBX03(self, data: NMEAMessage):
                 svid -= 210
             if gnss == 3 and svid > 32:  # Beidou
                 svid -= 32
-            if cno in ("", "0", 0) and not show_unused:  # omit unused sats
-                continue
             self.__app.gnss_status.gsv_data[(gnss, svid)] = (
                 gnss,
                 svid,
@@ -332,7 +327,7 @@ def _process_UBX03(self, data: NMEAMessage):
                 now,
             )
 
-        self.__app.gnss_status.siv = len(self.gsv_data)
+        self.__app.gnss_status.siv = len(self.__app.gnss_status.gsv_data)
 
     def _process_QTMVERNO(self, data: NMEAMessage):
         """

src/pygpsclient/skyview_frame.py

@@ -108,9 +108,9 @@ def update_frame(self):
         data = self.__app.gnss_status.gsv_data
         show_unused = self.__app.configuration.get("unusedsat_b")
         siv = len(data)
-        if siv == 0:
-            return
         siv = siv if show_unused else siv - unused_sats(data)
+        if siv <= 0:
+            return
 
         self.init_frame()
 

src/pygpsclient/ubx_handler.py

@@ -45,8 +45,6 @@ def __init__(self, app):
         self._cdb = 0
         self._raw_data = None
         self._parsed_data = None
-        # Holds array of current satellites in view from NMEA GSV or UBX NAV-SVINFO sentences
-        self.gsv_data = {}
 
     def process_data(self, raw_data: bytes, parsed_data: object):
         """
@@ -324,7 +322,7 @@ def _process_NAV_SAT(self, data: UBXMessage):
         :param UBXMessage data: NAV-SAT parsed message
         """
 
-        self.gsv_data = {}
+        self.__app.gnss_status.gsv_data = {}
         num_siv = int(data.numSvs)
         now = time()
 
@@ -338,10 +336,16 @@ def _process_NAV_SAT(self, data: UBXMessage):
             elev = getattr(data, "elev" + idx)
             azim = getattr(data, "azim" + idx)
             cno = getattr(data, "cno" + idx)
-            self.gsv_data[(gnssId, svid)] = (gnssId, svid, elev, azim, cno, now)
+            self.__app.gnss_status.gsv_data[(gnssId, svid)] = (
+                gnssId,
+                svid,
+                elev,
+                azim,
+                cno,
+                now,
+            )
 
-        self.__app.gnss_status.siv = len(self.gsv_data)
-        self.__app.gnss_status.gsv_data = self.gsv_data
+        self.__app.gnss_status.siv = len(self.__app.gnss_status.gsv_data)
 
     def _process_NAV_STATUS(self, data: UBXMessage):
         """
@@ -376,9 +380,9 @@ def _process_NAV_SVINFO(self, data: UBXMessage):
         :param UBXMessage data: NAV-SVINFO parsed message
         """
 
-        show_unused = self.__app.configuration.get("unusedsat_b")
-        self.gsv_data = {}
+        self.__app.gnss_status.gsv_data = {}
         num_siv = int(data.numCh)
+        now = time()
 
         for i in range(num_siv):
             idx = f"_{i+1:02d}"
@@ -387,11 +391,16 @@ def _process_NAV_SVINFO(self, data: UBXMessage):
             elev = getattr(data, "elev" + idx)
             azim = getattr(data, "azim" + idx)
             cno = getattr(data, "cno" + idx)
-            if cno == 0 and not show_unused:  # omit unused sats
-                continue
-            self.gsv_data[f"{gnssId}-{svid}"] = (gnssId, svid, elev, azim, cno)
+            self.__app.gnss_status.gsv_data[(gnssId, svid)] = (
+                gnssId,
+                svid,
+                elev,
+                azim,
+                cno,
+                now,
+            )
 
-        self.__app.gnss_status.gsv_data = self.gsv_data
+        self.__app.gnss_status.siv = len(self.__app.gnss_status.gsv_data)
 
     def _process_NAV_SOL(self, data: UBXMessage):
         """