update prostocol mask

Author: semuadmin

src/pygpsclient/app.py

@@ -70,9 +70,6 @@
 from pygpsclient.configuration import Configuration
 from pygpsclient.dialog_state import DialogState
 from pygpsclient.file_handler import FileHandler
-from pygpsclient.globals import (
-    UNI_PROTOCOL,  # replace by pygnssutils value when available
-)
 from pygpsclient.globals import (
     BGCOL,
     CLASS,
@@ -100,6 +97,7 @@
     STATUSPRIORITY,
     TTY_PROTOCOL,
     UNDO,
+    UNI_PROTOCOL,
 )
 from pygpsclient.gnss_status import GNSSStatus
 from pygpsclient.helpers import (
@@ -1241,9 +1239,10 @@ def protocol_mask(self) -> int:
             + (cfg.get("rtcmprot_b") * RTCM3_PROTOCOL)  # 4
             + (cfg.get("sbfprot_b") * SBF_PROTOCOL)  # 8
             + (cfg.get("qgcprot_b") * QGC_PROTOCOL)  # 16
-            + (cfg.get("spartnprot_b") * SPARTN_PROTOCOL)  # 32
-            + (cfg.get("mqttprot_b") * MQTT_PROTOCOL)  # 64
-            + (cfg.get("ttyprot_b") * TTY_PROTOCOL)  # 128
+            + (cfg.get("uniprot_b") * UNI_PROTOCOL)  # 32
+            + (cfg.get("spartnprot_b") * SPARTN_PROTOCOL)  # 256
+            + (cfg.get("mqttprot_b") * MQTT_PROTOCOL)  # 512
+            + (cfg.get("ttyprot_b") * TTY_PROTOCOL)  # 1024
         )
         return mask
 

src/pygpsclient/configuration.py

@@ -116,7 +116,7 @@ def __init__(self, app):
             "rtcmprot_b": 1,
             "sbfprot_b": 0,
             "qgcprot_b": 0,
-            "unicoreprot_b": 0,
+            "uniprot_b": 0,
             "spartnprot_b": 0,
             "mqttprot_b": 1,
             "ttyprot_b": 0,

src/pygpsclient/globals.py

@@ -52,11 +52,11 @@
 PLOTCOLS = ("#FFFF00", "#00FFFF", "#FF00FF", "#00BFFF")
 PNTCOL = "#FF8000"  # default plot point color
 
-# Protocols to be used in protocol mask (others defined in gnss_reader.py)
-SPARTN_PROTOCOL = 32
-MQTT_PROTOCOL = 64
-TTY_PROTOCOL = 128
-UNI_PROTOCOL = 256
+# Protocols to be used in protocol mask (others defined in pygnssutils.gnss_reader.py)
+UNI_PROTOCOL = 32  # provisional - awaiting pygnssutils.gnssreader updates for Unicore
+SPARTN_PROTOCOL = 256
+MQTT_PROTOCOL = 512
+TTY_PROTOCOL = 1024
 
 # Various global constants - please keep in ascending alphabetical order
 HOME = Path.home()

src/pygpsclient/settings_child_frame.py

@@ -508,7 +508,7 @@ def _attach_events(self, add: bool = True):
         self._prot_ubx.trace_update(tracemode, self._on_update_ubxprot, add)
         self._prot_sbf.trace_update(tracemode, self._on_update_sbfprot, add)
         self._prot_qgc.trace_update(tracemode, self._on_update_qgcprot, add)
-        self._prot_unicore.trace_update(tracemode, self._on_update_unicoreprot, add)
+        self._prot_unicore.trace_update(tracemode, self._on_update_uniprot, add)
         self._prot_nmea.trace_update(tracemode, self._on_update_nmeaprot, add)
         self._prot_rtcm.trace_update(tracemode, self._on_update_rtcmprot, add)
         self._prot_spartn.trace_update(tracemode, self._on_update_spartnprot, add)
@@ -586,13 +586,13 @@ def _on_update_qgcprot(self, var, index, mode):
         if not self._prot_tty.get():
             self.__app.configuration.set("qgcprot_b", self._prot_qgc.get())
 
-    def _on_update_unicoreprot(self, var, index, mode):
+    def _on_update_uniprot(self, var, index, mode):
         """
         Action on updating unicoreprot.
         """
 
         if not self._prot_tty.get():
-            self.__app.configuration.set("unicoreprot_b", self._prot_unicore.get())
+            self.__app.configuration.set("uniprot_b", self._prot_unicore.get())
 
     def _on_update_nmeaprot(self, var, index, mode):
         """
@@ -644,7 +644,7 @@ def _on_update_ttyprot(self, var, index, mode):
                 self._prot_ubx.set(cfg.get("ubxprot_b"))
                 self._prot_sbf.set(cfg.get("sbfprot_b"))
                 self._prot_qgc.set(cfg.get("qgcprot_b"))
-                self._prot_unicore.set(cfg.get("unicoreprot_b"))
+                self._prot_unicore.set(cfg.get("uniprot_b"))
                 self._prot_rtcm.set(cfg.get("rtcmprot_b"))
                 self._prot_spartn.set(cfg.get("spartnprot_b"))
             cfg.set("ttyprot_b", tty)