Merge pull request #187 from semuconsulting/RC-1.2.54

Rc 1.2.54

Author: semuadmin

RELEASE_NOTES.md

@@ -1,5 +1,16 @@
 # pyubx2 Release Notes
 
+### RELEASE 1.2.54
+
+FIXES:
+
+1. Fix SEC-SIG v2 payload definition (repeating group omitted) - Fixes #186.
+
+CHANGES:
+
+1. Minor changes to `dop2str()` helper method.
+1. Minimum pyrtcm version updated to 1.1.8 (includes some exception handling enhancements).
+
 ### RELEASE 1.2.53
 
 CHANGES:

pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
 ]
 
-dependencies = ["pynmeagps >= 1.0.50", "pyrtcm >= 1.1.7"]
+dependencies = ["pynmeagps >= 1.0.50", "pyrtcm >= 1.1.8"]
 
 [project.urls]
 homepage = "https://github.com/semuconsulting/pyubx2"

src/pyubx2/_version.py

@@ -8,4 +8,4 @@
 :license: BSD 3-Clause
 """
 
-__version__ = "1.2.53"
+__version__ = "1.2.54"

src/pyubx2/ubxhelpers.py

@@ -192,7 +192,9 @@ def dop2str(dop: float) -> str:
 
     """
 
-    if dop == 1:
+    if dop == 0:
+        dops = "N/A"
+    elif dop <= 1:
         dops = "Ideal"
     elif dop <= 2:
         dops = "Excellent"

src/pyubx2/ubxtypes_get.py

@@ -3544,6 +3544,18 @@
         ),
         "reserved0": U1,
         "jamNumCentFreqs": U1,
+        "group": (
+            "jamNumCentFreqs",
+            {
+                "jamStateCentFreq": (
+                    X4,
+                    {
+                        "centFreq": U23,
+                        "jammed": U1,
+                    },
+                ),
+            },
+        ),
     },
     "SEC-SIGLOG": {
         "version": U1,  # 0x00

tests/test_static.py

@@ -152,7 +152,7 @@ def testUBX2Bytes(self):
 
     def testKeyfromVal(self):
         res = key_from_val(UBX_CLASSES, "MON")
-        self.assertEqual(res, (b"\x0A"))
+        self.assertEqual(res, (b"\x0a"))
 
     def testCalcChecksum(self):
         res = calc_checksum(b"\x06\x01\x02\x00\xf0\x05")
@@ -198,9 +198,19 @@ def testgps2str(self):
             self.assertEqual(res, fixs[i])
 
     def testdop2str(self):
-        dops = ["Ideal", "Excellent", "Good", "Moderate", "Fair", "Poor"]
+        dops = [
+            "N/A",
+            "Ideal",
+            "Ideal",
+            "Excellent",
+            "Excellent",
+            "Good",
+            "Moderate",
+            "Fair",
+            "Poor",
+        ]
         i = 0
-        for dop in (1, 2, 5, 10, 20, 30):
+        for dop in (0, 0.9, 1, 1.4, 2, 5, 10, 20, 30):
             res = dop2str(dop)
             self.assertEqual(res, dops[i])
             i += 1

tests/test_stream.py

@@ -287,7 +287,7 @@ def testSEC(
         EXPECTED_RESULTS = (
             "<UBX(SEC-SIGLOG, version=1, numEvents=0, reserved0=437050933248)>",
             "<UBX(SEC-OSNMA, version=3, headerAuthStatus=0, nmaStatus=0, chainInForce=0, CPKS=0, osnmaEnabled=0, numSVs=0, nmaHeaderUpdate=0, timSyncEnabled=0, timSyncStatus=0, timSyncReqDiff=0, reserved0=1, dsmAuthenticationStatus=0, hashFunction=0, macFunction=0, pubKeyId=0, macLookupTable=0, keySize=0, macSize=0, fromNVS=0, teslaKeyAuthStatus=6, wnSf=2132, towSf=203, chainId=0, authSVs=0, authNumTim=16, timingAuthResult=0, macAdkdType=0, pubKeySrc=0, merkleRootSrc=0, merkleRootVal=0, futureMerkleRootSrc=0, futureMerkleRootVal=0, pubKeyVal=0, futurePubKeyVal=0, futurePubKeySrc=0, futurePubKeyId=0)>",
-            "<UBX(SEC-SIG, version=2, jamDetEnabled=1, jammingState=1, spfDetEnabled=1, spoofingState=1, reserved0=0, jamNumCentFreqs=6)>",
+            "<UBX(SEC-SIG, version=2, jamDetEnabled=1, jammingState=1, spfDetEnabled=1, spoofingState=1, reserved0=0, jamNumCentFreqs=6, centFreq_01=1575420, jammed_01=0, centFreq_02=1561098, jammed_02=0, centFreq_03=1602000, jammed_03=0, centFreq_04=1227600, jammed_04=0, centFreq_05=1207140, jammed_05=0, centFreq_06=1246000, jammed_06=0)>",
             "<UBX(SEC-SIGLOG, version=1, numEvents=0, reserved0=437116469248)>",
             "<UBX(SEC-OSNMA, version=3, headerAuthStatus=0, nmaStatus=0, chainInForce=0, CPKS=0, osnmaEnabled=0, numSVs=0, nmaHeaderUpdate=0, timSyncEnabled=0, timSyncStatus=0, timSyncReqDiff=0, reserved0=1, dsmAuthenticationStatus=0, hashFunction=0, macFunction=0, pubKeyId=0, macLookupTable=0, keySize=0, macSize=0, fromNVS=0, teslaKeyAuthStatus=1, wnSf=2254, towSf=203, chainId=0, authSVs=0, authNumTim=16, timingAuthResult=0, macAdkdType=0, pubKeySrc=0, merkleRootSrc=0, merkleRootVal=0, futureMerkleRootSrc=0, futureMerkleRootVal=0, pubKeyVal=0, futurePubKeyVal=0, futurePubKeySrc=0, futurePubKeyId=0)>",
             "<UBX(SEC-SIGLOG, version=1, numEvents=0, reserved0=437182005248)>",