Merge pull request #156 from semuconsulting/RC-1.4.24

Rc 1.4.24

Author: semuadmin

.vscode/settings.json

@@ -4,6 +4,6 @@
     "editor.formatOnSave": true,
     "modulename": "pygpsclient",
     "distname": "pygpsclient",
-    "moduleversion": "1.4.23",
+    "moduleversion": "1.4.24",
     "python.defaultInterpreterPath": "python3",
 }

RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # PyGPSClient Release Notes
 
+### RELEASE 1.4.24
+
+FIXES:
+
+1. Fix NMEA GSV SV range handling - was omitting certain SVIDs.
+
 ### RELEASE 1.4.23
 
 CHANGES:

pyproject.toml

@@ -7,7 +7,7 @@ name = "pygpsclient"
 authors = [{ name = "semuadmin", email = "[email protected]" }]
 maintainers = [{ name = "semuadmin", email = "[email protected]" }]
 description = "GNSS Diagnostic and UBX Configuration GUI Application"
-version = "1.4.23"
+version = "1.4.24"
 license = { file = "LICENSE" }
 keywords = [
     "PyGPSClient",

src/pygpsclient/_version.py

@@ -8,4 +8,4 @@
 :license: BSD 3-Clause
 """
 
-__version__ = "1.4.23"
+__version__ = "1.4.24"

src/pygpsclient/gnss_status.py

@@ -49,7 +49,7 @@ def __init__(self):
         self.acc_heading = 0.0  # rover relative position heading accuracy
         self.acc_length = 0.0  # rover relative position distance accuracy
         self.rel_pos_flags = []  # rover relative position flags
-        self.gsv_data = []  # list of satellite tuples (gnssId, svid, elev, azim, cno)
+        self.gsv_data = {}  # list of satellite tuples (gnssId, svid, elev, azim, cno)
         self.version_data = {}  # dict of hardware, firmware and software versions
         self.sysmon_data = {}  # dict of system monitor data (cpu and memory load, etc.)
         self.spectrum_data = []  # list of spectrum data (spec, spn, res, ctr, pga)

src/pygpsclient/graphview_frame.py

@@ -167,7 +167,7 @@ def update_frame(self):
         offset = AXIS_XL + 2
         colwidth = (w - AXIS_XL - AXIS_XR + 1) / siv
         resize_font = font.Font(size=min(int(colwidth / 2), 10))
-        for d in sorted(data):  # sort by ascending gnssid, svid
+        for d in sorted(data.values()):  # sort by ascending gnssid, svid
             gnssId, prn, _, _, snr = d
             if snr in ("", "0", 0):
                 snr = 1  # show 'place marker' in graph

src/pygpsclient/nmea_handler.py

@@ -43,9 +43,8 @@ def __init__(self, app):
 
         self._raw_data = None
         self._parsed_data = None
-        self.gsv_data = (
-            []
-        )  # Holds array of current satellites in view from NMEA GSV sentences
+        # Holds array of current satellites in view from NMEA GSV sentences
+        self.gsv_data = {}
         self.gsv_log = {}  # Holds cumulative log of all satellites seen
 
     def process_data(self, raw_data: bytes, parsed_data: object):
@@ -197,7 +196,7 @@ def _process_GSV(self, data: NMEAMessage):
         """
 
         show_unused = self.__app.frm_settings.config["unusedsat_b"]
-        self.gsv_data = []
+        self.gsv_data = {}
         gsv_dict = {}
         now = time()
         if data.talker == "GA":
@@ -212,7 +211,7 @@ def _process_GSV(self, data: NMEAMessage):
             gnss = 0  # GPS, SBAS, QZSS
 
         for i in range(4):
-            idx = f"_{i:02d}"
+            idx = f"_{i+1:02d}"
             svid = getattr(data, "svid" + idx, "")
             if svid != "":
                 key = f"{gnss}-{svid}"
@@ -232,7 +231,7 @@ def _process_GSV(self, data: NMEAMessage):
             if cno in ("", "0", 0) and not show_unused:  # omit unused sats
                 continue
             if now - lastupdate < SAT_EXPIRY:  # expire passed sats
-                self.gsv_data.append((gnssId, svid, elev, azim, cno))
+                self.gsv_data[key] = (gnssId, svid, elev, azim, cno)
 
         self.__app.gnss_status.siv = len(self.gsv_data)
         self.__app.gnss_status.gsv_data = self.gsv_data
@@ -292,36 +291,22 @@ def _process_UBX03(self, data: NMEAMessage):
 
         settings = self.__app.frm_settings.config
         show_unused = settings["unusedsat_b"]
-        self.gsv_data = []
-        gsv_dict = {}
-        now = time()
+        self.gsv_data = {}
         for i in range(data.numSv):
-            svid = getattr(data, f"svid_{i+1:02}")
+            idx = f"_{i+1:02d}"
+            svid = getattr(data, "svid" + idx)
             gnss = svid2gnssid(svid)
+            elev = getattr(data, "ele" + idx)
+            azim = getattr(data, "azi" + idx)
+            cno = str(getattr(data, "cno" + idx))
             # fudge to make PUBX03 svid numbering consistent with GSV
             if gnss == 2 and svid > 210:  # Galileo
                 svid -= 210
             if gnss == 3 and svid > 32:  # Beidou
                 svid -= 32
-            key = f"{gnss}-{svid}"
-            gsv_dict[key] = (
-                gnss,
-                svid,
-                getattr(data, f"ele_{i+1:02}"),
-                getattr(data, f"azi_{i+1:02}"),
-                str(getattr(data, f"cno_{i+1:02}")),
-                now,
-            )
-
-        for key in gsv_dict:
-            self.gsv_log[key] = gsv_dict[key]
-
-        for key in self.gsv_log:
-            gnssId, svid, elev, azim, snr, lastupdate = self.gsv_log[key]
-            if snr in ("", "0", 0) and not show_unused:  # omit unused sats
+            if cno in ("", "0", 0) and not show_unused:  # omit unused sats
                 continue
-            if now - lastupdate < SAT_EXPIRY:  # expire passed sats
-                self.gsv_data.append((gnssId, svid, elev, azim, snr))
+            self.gsv_data[f"{gnss}-{svid}"] = (gnss, svid, elev, azim, cno)
 
         self.__app.gnss_status.siv = len(self.gsv_data)
         self.__app.gnss_status.gsv_data = self.gsv_data

src/pygpsclient/skyview_frame.py

@@ -117,7 +117,7 @@ def update_frame(self):
         resize_font = font.Font(size=min(int(maxr / 10), 8))
         self.init_frame()
 
-        for d in sorted(data, key=itemgetter(4)):  # sort by ascending snr
+        for d in sorted(data.values(), key=itemgetter(4)):  # sort by ascending snr
             try:
                 gnssId, prn, ele, azi, snr = d
                 ele = int(ele)

src/pygpsclient/ubx_handler.py

@@ -44,9 +44,8 @@ def __init__(self, app):
         self._cdb = 0
         self._raw_data = None
         self._parsed_data = None
-        self.gsv_data = (
-            []
-        )  # Holds array of current satellites in view from NMEA GSV or UBX NAV-SVINFO sentences
+        # 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):
         """
@@ -314,7 +313,7 @@ def _process_NAV_SAT(self, data: UBXMessage):
 
         settings = self.__app.frm_settings.config
         show_unused = settings["unusedsat_b"]
-        self.gsv_data = []
+        self.gsv_data = {}
         num_siv = int(data.numSvs)
 
         for i in range(num_siv):
@@ -329,7 +328,7 @@ def _process_NAV_SAT(self, data: UBXMessage):
             cno = getattr(data, "cno" + idx)
             if cno == 0 and not show_unused:  # omit unused sats
                 continue
-            self.gsv_data.append((gnssId, svid, elev, azim, cno))
+            self.gsv_data[f"{gnssId}-{svid}"] = (gnssId, svid, elev, azim, cno)
 
         self.__app.gnss_status.siv = len(self.gsv_data)
         self.__app.gnss_status.gsv_data = self.gsv_data
@@ -379,7 +378,7 @@ def _process_NAV_SVINFO(self, data: UBXMessage):
             cno = getattr(data, "cno" + idx)
             if cno == 0 and not show_unused:  # omit unused sats
                 continue
-            self.gsv_data.append((gnssId, svid, elev, azim, cno))
+            self.gsv_data[f"{gnssId}-{svid}"] = (gnssId, svid, elev, azim, cno)
 
         self.__app.gnss_status.gsv_data = self.gsv_data