diff --git a/.vscode/settings.json b/.vscode/settings.json index 8fc9fa4..4a46f3b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,5 @@ "python.defaultInterpreterPath": "python3", "modulename": "${workspaceFolderBasename}", "distname": "${workspaceFolderBasename}", - "moduleversion": "1.1.6" + "moduleversion": "1.1.7" } \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 95cdef3..9b945b3 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,12 @@ # pygnssutils Release Notes +### RELEASE 1.1.7 + +ENHANCEMENTS: + +1. gnssntripclient will now tolerate an NTRIP 1.0 response to an NTRIP 2.0 request if the caster only supports NTRIP 1.0, or vice versa. +1. gnssstreamer now supports both NTRIP 1.0 and NTRIP 2.0 clients via the `-rtkntripversion` flag (previously it assumed NTRIP 2.0). + ### RELEASE 1.1.6 FIXES: diff --git a/pyproject.toml b/pyproject.toml index 282d57f..d071a2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pygnssutils" authors = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] maintainers = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] description = "GNSS Command Line Utilities" -version = "1.1.6" +version = "1.1.7" license = { file = "LICENSE" } readme = "README.md" requires-python = ">=3.9" diff --git a/src/pygnssutils/_version.py b/src/pygnssutils/_version.py index 075d1e7..ea5621a 100644 --- a/src/pygnssutils/_version.py +++ b/src/pygnssutils/_version.py @@ -8,4 +8,4 @@ :license: BSD 3-Clause """ -__version__ = "1.1.6" +__version__ = "1.1.7" diff --git a/src/pygnssutils/gnssntripclient.py b/src/pygnssutils/gnssntripclient.py index 2942c13..9324160 100644 --- a/src/pygnssutils/gnssntripclient.py +++ b/src/pygnssutils/gnssntripclient.py @@ -60,7 +60,6 @@ HTTPCODES, MAXPORT, NOGGA, - NTRIP1, NTRIP2, NTRIP_EVENT, OUTPORT_NTRIP, @@ -893,8 +892,8 @@ def is_gnssdata(self) -> bool: :rtype: bool """ - return (self._ntrip_version == NTRIP2 and self.content_type == "gnss/data") or ( - self._ntrip_version == NTRIP1 and self.status["protocol"].lower() == "icy" + return ( + self.content_type == "gnss/data" or self.status["protocol"].upper() == "ICY" ) @property @@ -907,10 +906,8 @@ def is_sourcetable(self) -> bool: """ return ( - self._ntrip_version == NTRIP2 and self.content_type == "gnss/sourcetable" - ) or ( - self._ntrip_version == NTRIP1 - and self.status["protocol"].lower() == "sourcetable" + self.content_type == "gnss/sourcetable" + or self.status["protocol"].upper() == "SOURCETABLE" ) @property diff --git a/src/pygnssutils/gnssstreamer_cli.py b/src/pygnssutils/gnssstreamer_cli.py index e4bf17f..2ac5504 100644 --- a/src/pygnssutils/gnssstreamer_cli.py +++ b/src/pygnssutils/gnssstreamer_cli.py @@ -138,6 +138,7 @@ def _setup_input_ntrip(app: object, datatype: str, **kwargs) -> object: mountpoint=path, ntripuser=kwargs.get("rtkuser", "anon"), ntrippassword=kwargs.get("rtkpassword", "password"), + version=kwargs.get("rtkntripversion", "2.0"), ggamode=0, ggainterval=kwargs.get("rtkggaint", -1), datatype=datatype, @@ -583,6 +584,13 @@ def main(): help="Password for RTK service (if --cliinput = 1, 2 or 3).", default="password", ) + ap.add_argument( + "--rtkntripversion", + required=False, + help="NTRIP version (if --cliinput = 1)", + choices=["1.0", "2.0"], + default="2.0", + ) ap.add_argument( "--rtkggaint", required=False,