From 9d7e1e6074481616a2c36059730f4f7c771474d1 Mon Sep 17 00:00:00 2001 From: semuadmin <28569967+semuadmin@users.noreply.github.com> Date: Tue, 28 May 2024 14:20:27 +0100 Subject: [PATCH 1/3] NAV-PVT typo corrected - difSoln is now diffSoln Fixes #152 --- .vscode/settings.json | 2 +- RELEASE_NOTES.md | 6 ++++++ pyproject.toml | 2 +- src/pyubx2/_version.py | 2 +- src/pyubx2/ubxtypes_get.py | 2 +- tests/test_stream.py | 20 ++++++++++---------- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4d79b44..281127e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,5 @@ "editor.formatOnSave": true, "modulename": "${workspaceFolderBasename}", "distname": "${workspaceFolderBasename}", - "moduleversion": "1.2.42", + "moduleversion": "1.2.43", } \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a9f1c6c..ed2f62f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,11 @@ # pyubx2 Release Notes +### RELEASE 1.2.43 + +FIXES: + +1. Fix typo in NAV-PVT definition = difSoln is now diffSoln. Fixes [#152](https://github.com/semuconsulting/pyubx2/issues/152) + ### RELEASE 1.2.42 ENHANCEMENTS: diff --git a/pyproject.toml b/pyproject.toml index f12c532..b75350a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pyubx2" authors = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] maintainers = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] description = "UBX protocol parser and generator" -version = "1.2.42" +version = "1.2.43" license = { file = "LICENSE" } readme = "README.md" requires-python = ">=3.8" diff --git a/src/pyubx2/_version.py b/src/pyubx2/_version.py index 30bc74b..dd9d621 100644 --- a/src/pyubx2/_version.py +++ b/src/pyubx2/_version.py @@ -8,4 +8,4 @@ :license: BSD 3-Clause """ -__version__ = "1.2.42" +__version__ = "1.2.43" diff --git a/src/pyubx2/ubxtypes_get.py b/src/pyubx2/ubxtypes_get.py index c49f81b..a63e7e4 100644 --- a/src/pyubx2/ubxtypes_get.py +++ b/src/pyubx2/ubxtypes_get.py @@ -2429,7 +2429,7 @@ X1, { "gnssFixOk": U1, - "difSoln": U1, + "diffSoln": U1, "psmState": U3, "headVehValid": U1, "carrSoln": U2, diff --git a/tests/test_stream.py b/tests/test_stream.py index b4e1071..26baac8 100644 --- a/tests/test_stream.py +++ b/tests/test_stream.py @@ -60,7 +60,7 @@ def testNAVLOG( self, ): # test stream of UBX NAV messages EXPECTED_RESULTS = ( - "", + "", "", "", "", @@ -289,13 +289,13 @@ def testCFGLOG( def testMIXED(self): # TODO test mixed UBX/NMEA stream with no protfilter EXPECTED_RESULTS = ( - "", + "", "", "", - "", + "", "", "", - "", + "", ) i = 0 with open(os.path.join(DIRNAME, "pygpsdata-MIXED3.log"), "rb") as stream: @@ -307,9 +307,9 @@ def testMIXED(self): # TODO test mixed UBX/NMEA stream with no protfilter def testMIXEDUBXFILT(self): # TODO test mixed UBX/NMEA stream with UBX protfilter EXPECTED_RESULTS = ( - "", - "", - "", + "", + "", + "", ) i = 0 with open(os.path.join(DIRNAME, "pygpsdata-MIXED3.log"), "rb") as stream: @@ -346,7 +346,7 @@ def testMIXEDRTCM( "", "", "", - "", + "", "", ) i = 0 @@ -366,7 +366,7 @@ def testMIXEDRTCM2( ): # test mixed stream of NMEA, UBX & RTCM messages with protfilter = 3 EXPECTED_RESULTS = ( "", - "", + "", "", ) i = 0 @@ -482,7 +482,7 @@ def testUBXITERATE_ERR2( self, ): # UBXReader helper method ignoring bad checksum and passing error handler EXPECTED_RESULTS = [ - "", + "", "", "", "I ignored the following error: Message checksum b's\\x8e' invalid - should be b's\\x8d'", From 4120fb1b600cd2a69c6cb5aa492de97154a978a3 Mon Sep 17 00:00:00 2001 From: semuadmin <28569967+semuadmin@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:08:58 +0100 Subject: [PATCH 2/3] update min pynmeagps version to 1.0.37 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b75350a..309ba7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: GIS", ] -dependencies = ["pynmeagps >= 1.0.36", "pyrtcm >= 1.1.1"] +dependencies = ["pynmeagps >= 1.0.37", "pyrtcm >= 1.1.1"] [project.urls] homepage = "https://github.com/semuconsulting/pyubx2" From 1d7eb3849e443cfba2462ef88f712ab2175af9a2 Mon Sep 17 00:00:00 2001 From: semuadmin <28569967+semuadmin@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:37:02 +0100 Subject: [PATCH 3/3] update release notes --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ed2f62f..be756a4 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,7 +4,7 @@ FIXES: -1. Fix typo in NAV-PVT definition = difSoln is now diffSoln. Fixes [#152](https://github.com/semuconsulting/pyubx2/issues/152) +1. Fix typo in NAV-PVT definition = difSoln is now diffSoln. Fixes [#152](https://github.com/semuconsulting/pyubx2/issues/152). **NB:** any existing references to `msg.difSoln` will need to be changed to `msg.diffSoln` in user code. ### RELEASE 1.2.42