Merge branch 'master' of https://github.com/semuconsulting/pyubx2

Author: semuadmin

.github/workflows/checkpr.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13","3.14.0-rc.2"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.2"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

.vscode/settings.json

@@ -22,5 +22,6 @@
     "python.analysis.addHoverSummaries": false,
     "python-envs.defaultEnvManager": "ms-python.python:venv",
     "python-envs.pythonProjects": [],
-    "python.defaultInterpreterPath": "${userHome}/pygpsclient/bin/python3"
+    "python.defaultInterpreterPath": "${userHome}/pygpsclient/bin/python3",
+    "python.testing.unittestEnabled": false
 }

README.md

@@ -289,7 +289,7 @@ b'\xb5b\x06\x01\x08\x00\xf0\x01\x00\x01\x00\x01\x00\x00\x022'
 
 **CFG-VALSET, CFG-VALDEL and CFG-VALGET message types**
 
-Generation 9 of the UBX protocol (*23.01 or greater, e.g. NEO-M9N, ZED-F9P*) introduced the concept of a device configuration interface with configurable parameters being set or unset (del) in the designated memory layer(s) via the CFG-VALSET and CFG-VALDEL message types, or queried via the CFG-VALGET message type. *Legacy CFG configuration message types continue to be supported but are now deprecated on Generation 9+ devices*.
+Generation 9 of the UBX protocol (*23.01 or greater, e.g. NEO-M9N, ZED-F9P*) introduced the concept of a device configuration interface with configurable parameters being set or unset (del) in the designated memory layer(s) via the CFG-VALSET and CFG-VALDEL message types, or queried via the CFG-VALGET message type. *Legacy CFG configuration message types continue to be supported in earlier devices but are deprecated on Generation 9 devices and removed altogether on Generation 10 (ZED-X20P, etc.)*.
 
 Optionally, batches of CFG-VALSET and CFG-VALDEL messages can be applied transactionally, with the combined configuration only being committed at the end of the transaction.
 

RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # pyubx2 Release Notes
 
+### RELEASE 1.2.59
+
+1. Add additional E6/L6 SIGID decodes.
+1. Update `str()` method to decode sigId where possible e.g. `L1_C/A`, `E1_C`. 
+1. Minor updates to static configuration database methods `config_set`, `config_get` & `config_del` to tolerate hyphens in configuration database key names e.g. “CFG-MSGOUT-UBX_RXM_RAWX_UART1” is treated as "CFG_MSGOUT_UBX_RXM_RAWX_UART1".
+
 ### RELEASE 1.2.58
 
 1. Minimum pynmeagps version updated to 1.0.54 - incorporates additional support for proprietary Quectel NMEA sentences.

pyproject.toml

@@ -11,7 +11,7 @@ description = "UBX protocol parser and generator"
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Operating System :: OS Independent",
     "Development Status :: 5 - Production/Stable",
@@ -23,7 +23,6 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Intended Audience :: End Users/Desktop",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -34,7 +33,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
 ]
 
-dependencies = ["pynmeagps >= 1.0.54", "pyrtcm >= 1.1.9"]
+dependencies = ["pynmeagps >= 1.0.55", "pyrtcm >= 1.1.9"]
 
 [project.urls]
 homepage = "https://github.com/semuconsulting/pyubx2"
@@ -68,10 +67,10 @@ deploy = [{ include-group = "build" }, { include-group = "test" }]
 version = { attr = "pyubx2._version.__version__" }
 
 [tool.black]
-target-version = ['py39']
+target-version = ['py310']
 
 [tool.isort]
-py_version = 39
+py_version = 310
 profile = "black"
 
 [tool.bandit]
@@ -82,7 +81,7 @@ skips = []
 jobs = 0
 reports = "y"
 recursive = "y"
-py-version = "3.9"
+py-version = "3.10"
 fail-under = "9.8"
 fail-on = "E,F"
 clear-cache-post-run = "y"

src/pyubx2/_version.py

@@ -8,4 +8,4 @@
 :license: BSD 3-Clause
 """
 
-__version__ = "1.2.58"
+__version__ = "1.2.59"

src/pyubx2/ubxhelpers.py

@@ -27,7 +27,7 @@
     UBX_HDR,
     UBX_PROTOCOL,
 )
-from pyubx2.ubxtypes_decodes import FIXTYPE, GNSSLIST
+from pyubx2.ubxtypes_decodes import FIXTYPE, GNSSLIST, SIGID
 
 EPOCH0 = datetime(1980, 1, 6)  # EPOCH start date
 LEAPOFFSET = 18  # leap year offset in seconds, valid as from 1/1/2017
@@ -204,12 +204,17 @@ def cfgname2key(name: str) -> tuple:
     Return hexadecimal key and data type for given
     configuration database key name.
 
+    NB: UBX_CONFIG_DATABASE uses underscores in key names,
+    whereas UBX documentation uses a mixture of hyphens
+    and underscores.
+
     :param str name: config key as string e.g. "CFG_NMEA_PROTVER"
     :return: tuple of (key, type)
     :rtype: tuple: (int, str)
     :raises: UBXMessageError
-
     """
+
+    name = name.replace("-", "_")
     try:
         return ubcdb.UBX_CONFIG_DATABASE[name]
     except KeyError as err:
@@ -554,6 +559,23 @@ def protocol(raw: bytes) -> int:
     return 0
 
 
+def sigid2str(gnss_id: int, sig_id: int) -> str:
+    """
+    Convert GNSS ID and Signal ID to descriptive string
+    ('GPS L1C/A', etc.).
+
+    :param int gnss_id: GNSS identifier as integer (0-6)
+    :param int sig_id: Signal identifier as integer
+    :return: GNSS identifier as string
+    :rtype: str
+    """
+
+    try:
+        return SIGID[(gnss_id, sig_id)]
+    except KeyError:
+        return str(sig_id)
+
+
 def utc2itow(utc: datetime, leaps: int = LEAPOFFSET) -> tuple:
     """
     Convert UTC datetime to GPS Week Number, Time Of Week

src/pyubx2/ubxmessage.py

@@ -27,6 +27,7 @@
     msgclass2bytes,
     msgstr2bytes,
     nomval,
+    sigid2str,
     val2bytes,
 )
 from pyubx2.ubxtypes_core import (
@@ -536,6 +537,12 @@ def __str__(self) -> str:
                     val = escapeall(val)
                 if att[0:6] == "gnssId":  # attribute is a GNSS ID
                     val = gnss2str(val)  # get string representation e.g. 'GPS'
+                if att[0:5] == "sigId":  # attribute is a Signal ID
+                    idx = att.split("_", 1)  # check for group index
+                    idxs = f"_{idx[1]}" if len(idx) > 1 else ""
+                    if hasattr(self, f"gnssId{idxs}"):
+                        # get string representation e.g. 'L1_C/A'
+                        val = sigid2str(getattr(self, f"gnssId{idxs}"), val)
                 if att == "iTOW":  # attribute is a GPS Time of Week
                     val = itow2utc(val)  # show time in UTC format
                 # if it's an ACK, we show what it's acknowledging in plain text

src/pyubx2/ubxtypes_decodes.py

@@ -446,33 +446,40 @@
 
 # key is (gnssId, sigId)
 SIGID = {
-    (0, 0): "GPS L1C/A",
-    (0, 3): "GPS L2 CL",
-    (0, 4): "GPS L2 CM",
-    (0, 6): "GPS L5 I",
-    (0, 7): "GPS L5 Q",
-    (1, 0): "SBAS L1C/A",
-    (2, 0): "Galileo E1 C",
-    (2, 1): "Galileo E1 B",
-    (2, 3): "Galileo E5 al",
-    (2, 4): "Galileo E5 aQ",
-    (2, 5): "Galileo E5 bI",
-    (2, 6): "Galileo E5 bQ",
-    (3, 0): "BeiDou B1I D1",
-    (3, 1): "BeiDou B1I D2",
-    (3, 2): "BeiDou B2I D1",
-    (3, 3): "BeiDou B2I D2",
-    (3, 5): "BeiDou B1C",
-    (3, 7): "BeiDou B2a",
-    (5, 0): "QZSS L1C/A",
-    (5, 1): "QZSS L1S",
-    (5, 4): "QZSS L2 CM",
-    (5, 5): "QZSS L2 CL",
-    (5, 8): "QZSS L5 I",
-    (5, 9): "QZSS L5 Q",
-    (6, 0): "GLONASS L1 OF",
-    (6, 2): "GLONASS L2 OF",
-    (7, 0): "NavIC L5 A",
+    (0, 0): "L1_C/A",
+    (0, 3): "L2_CL",
+    (0, 4): "L2_CM",
+    (0, 6): "L5_I",
+    (0, 7): "L5_Q",
+    (1, 0): "L1_C/A",
+    (2, 0): "E1_C",
+    (2, 1): "E1_B",
+    (2, 3): "E5_al",
+    (2, 4): "E5_aQ",
+    (2, 5): "E5_bI",
+    (2, 6): "E5_bQ",
+    (2, 8): "E6_B",
+    (2, 9): "E6_C",
+    (3, 0): "B1_ID1",
+    (3, 1): "B1I_D2",
+    (3, 2): "B2I_D1",
+    (3, 3): "B2I_D2",
+    (3, 4): "B3I_D1",
+    (3, 5): "B1_Cp",
+    (3, 6): "B1_Cd",
+    (3, 7): "B2_ap",
+    (3, 8): "B2_ad",
+    (3, 10): "B3I_D2",
+    (5, 0): "L1_C/A",
+    (5, 1): "L1_S",
+    (5, 4): "L2_CM",
+    (5, 5): "L2_CL",
+    (5, 8): "L5_I",
+    (5, 9): "L5_Q",
+    (5, 12): "L1_CB",
+    (6, 0): "L1_OF",
+    (6, 2): "L2_OF",
+    (7, 0): "L5_A",
 }
 """
 GNSS, Signal ID from UBX-NAV-SIG