pygnssutils 1.2.3__tar.gz → 1.2.4__tar.gz

{pygnssutils-1.2.3/src/pygnssutils.egg-info → pygnssutils-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygnssutils
-Version: 1.2.3
+Version: 1.2.4
 Summary: GNSS Command Line Utilities
 Author-email: Steve Smith <semuadmin@semuconsulting.com>
 Maintainer-email: Steve Smith <semuadmin@semuconsulting.com>
@@ -35,10 +35,10 @@ Requires-Dist: paho-mqtt>=2.1.0
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pyspartn>=1.0.8
 Requires-Dist: pyubx2>=1.3.3
-Requires-Dist: pynmeagps>=1.1.4
+Requires-Dist: pynmeagps>=1.1.5
 Requires-Dist: pysbf2>=1.0.4
 Requires-Dist: pyubxutils>=1.0.6
-Requires-Dist: pyqgc>=0.2.2
+Requires-Dist: pyqgc>=1.0.0
 Requires-Dist: pyunigps>=1.0.0
 Dynamic: license-file
 
@@ -81,7 +81,7 @@ designated output stream.
 a simple SPARTN IP (MQTT) Client which receives SPARTN correction data from an SPARTN IP location service and (optionally) sends this to a
 designated output stream.
 1. `SocketServer` class based on the native Python `ThreadingTCPServer`. Capable of operating in two modes - Socket Server or NTRIP Caster. Provides two alternate client request handler classes - `ClientHandler` (HTTP) or `ClientHandlerTLS` (HTTPS).
-1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: this initial ALPHA release has limited functionality.**
+1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental work in progress (*contributions and feedback welcome*)**
 
 The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnssutils](https://github.com/semuconsulting/pygnssutils).
 
@@ -543,15 +543,15 @@ class pygnssutils.rinex_conv.RinexConvertor(app, rinex_version, rinex_type, gnss
 
 A command line utility and Python class `RinexConverter` to convert binary GNSS data logs to RINEX text file format.
 
-**NB: The current ALPHA release implements the following functionality:**
+**NB: RINEX conversion is an experimental work in progress (*contributions and feedback welcome*). The current ALPHA release implements the following functionality:**
 
 1. RINEX versions 3.05 and 4.02.
 1. Convert binary UBX RXM-RAW or RXM-RAWX (raw observation) data from u-blox receivers (e.g. ZED-F9P) to RINEX Observation file format.
-1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
+1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2 & GLO L1OF**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
 1. Convert RTCM3 Ephemerides messages (1019, 1020, 1041-1046) from any source (including NTRIP caster or RTK base station receiver) to RINEX Navigation file format.
 1. Convert NMEA MWD (wind speed and direction) and XDR (temperature and pressure) sensor data to RINEX Meteorology file format.
 
-A Graphical User Interface for this utility will be added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
+A Graphical User Interface for this utility has been added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
 
 Assuming the u-blox receiver is already configured to output raw observation (UBX-RXM-RAWX) and navigation subframe (UBX-RXM-SFRBX) data, a suitable input log file can be created using the pygnssutils `gnssstreamer` CLI utility e.g. ...
 

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/README.md

@@ -37,7 +37,7 @@ designated output stream.
 a simple SPARTN IP (MQTT) Client which receives SPARTN correction data from an SPARTN IP location service and (optionally) sends this to a
 designated output stream.
 1. `SocketServer` class based on the native Python `ThreadingTCPServer`. Capable of operating in two modes - Socket Server or NTRIP Caster. Provides two alternate client request handler classes - `ClientHandler` (HTTP) or `ClientHandlerTLS` (HTTPS).
-1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: this initial ALPHA release has limited functionality.**
+1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental work in progress (*contributions and feedback welcome*)**
 
 The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnssutils](https://github.com/semuconsulting/pygnssutils).
 
@@ -499,15 +499,15 @@ class pygnssutils.rinex_conv.RinexConvertor(app, rinex_version, rinex_type, gnss
 
 A command line utility and Python class `RinexConverter` to convert binary GNSS data logs to RINEX text file format.
 
-**NB: The current ALPHA release implements the following functionality:**
+**NB: RINEX conversion is an experimental work in progress (*contributions and feedback welcome*). The current ALPHA release implements the following functionality:**
 
 1. RINEX versions 3.05 and 4.02.
 1. Convert binary UBX RXM-RAW or RXM-RAWX (raw observation) data from u-blox receivers (e.g. ZED-F9P) to RINEX Observation file format.
-1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
+1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2 & GLO L1OF**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
 1. Convert RTCM3 Ephemerides messages (1019, 1020, 1041-1046) from any source (including NTRIP caster or RTK base station receiver) to RINEX Navigation file format.
 1. Convert NMEA MWD (wind speed and direction) and XDR (temperature and pressure) sensor data to RINEX Meteorology file format.
 
-A Graphical User Interface for this utility will be added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
+A Graphical User Interface for this utility has been added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
 
 Assuming the u-blox receiver is already configured to output raw observation (UBX-RXM-RAWX) and navigation subframe (UBX-RXM-SFRBX) data, a suitable input log file can be created using the pygnssutils `gnssstreamer` CLI utility e.g. ...
 

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/pyproject.toml

@@ -39,10 +39,10 @@ dependencies = [
     "pyserial>=3.5",
     "pyspartn>=1.0.8",
     "pyubx2>=1.3.3",
-    "pynmeagps>=1.1.4",
+    "pynmeagps>=1.1.5",
     "pysbf2>=1.0.4",
     "pyubxutils>=1.0.6",
-    "pyqgc>=0.2.2",
+    "pyqgc>=1.0.0",
     "pyunigps>=1.0.0",
 ]
 

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/_version.py

@@ -8,4 +8,4 @@ Created on 2 Oct 2020
 :license: BSD 3-Clause
 """
 
-__version__ = "1.2.3"
+__version__ = "1.2.4"

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/rawnav.py

@@ -47,11 +47,11 @@ navigation data:
 
 https://www.u-blox.com/sites/default/files/ZED-F9P_IntegrationManual_UBX-18010802.pdf
 
-NB: Alpha Support currently limited to:
+NB: Alpha release currently implements:
     - GPS LNAV, CNAV
     - GAL FNAV, INAV
-    - BDS D1
-... pending transcription of other GNSS ICDs.
+    - BDS D1, D2
+    - GLO L1OF
 
 Created on 20 Apr 2026
 
@@ -136,9 +136,10 @@ class RawNav:
         self._gnss = gnss
         self._svid = svid
         self._sigcode = sigcode
-        self.wn = -1
-        self.toc = -1
-        self.tow = -1
+        if gnss != "R":
+            self.wn = -1
+            self.toc = -1
+            self.tow = -1
         self._subframeacq = 0
         self._msb = {}
         self._isb = {}
@@ -603,16 +604,18 @@ class RawNavReader:
         subframe = 0
         subframeid = 0
         subframepageid = 0
+        freqid = data.freqId
 
-        # for GLO, subframe = 85 bits, 3 * 32 bit dwrds, plus
-        # a receiver-generated 4th 32 dwrd containing subframe and page ids
-        if sigcode in ("1C", "2C"):  # GLO L1,L2
+        # for GLO, subframe = 85 bits,
+        # 3 * 32 bit dwrds with 11 bits padding at end,
+        # plus a receiver-generated 4th dwrd containing superframe and frame ids
+        if sigcode in ("1C",):  # GLO L1OF
             for i in range(numw):
                 wrd = getattr(data, f"dwrd_{i+1:02d}")
                 subframe += wrd << (32 * (numw - 1 - i))
-            subframepageid = (subframe >> 16) & 0xFFFF
-            subframeid = subframe & 0b11111111
-            subframe = (subframe >> 43) & 0x1FFFFFFFFFFFFFFFFFFFFF  # strip 4th dwrd
+            # strip 4th dwrd, leaving 85 bit subframe
+            subframe = (subframe >> 43) & 0x1FFFFFFFFFFFFFFFFFFFFF  # 2**85-1
+            subframeid = (subframe >> 80) & 0b01111
 
         return {
             "gnss": gnss,
@@ -621,6 +624,7 @@ class RawNavReader:
             "subframeid": subframeid,
             "subframepageid": subframepageid,
             "subframe": subframe,
+            "freqid": freqid,
         }
 
     def _process_rxm_sfrbx_sba(

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/rinex_conv.py

@@ -327,7 +327,7 @@ class RinexConverter:
             TypeError,
             ValueError,
         ):
-            self.logger.exception(f"RINEX NAV Conversion error")
+            self.logger.exception("RINEX NAV Conversion error")
             res = RINEX_ERROR
         except KeyboardInterrupt:
             self.logger.warning("Terminated by user")

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/rinex_conv_nav.py

@@ -8,7 +8,6 @@ Converts NAV message data to RINEX Navigation text format.
 NB: Alpha release currently limited to following data sources:
 
 - RawNav objects containing data collated from UBX RXM-SFRBX messages
-  (GPS LNAV/CNAV, GAL FNAV,INAV, BDS D1 only)
 - RTCM3 ephemerides messages 1019, 1020, 1041-1046 e.g. from RTK receiver
   or NTRIP data stream
 
@@ -52,6 +51,7 @@ from pygnssutils.rinex_globals import (
     ION,
     IRN,
     KLOB,
+    L1OF,
     LNAV,
     NAV,
     NEQUICK,
@@ -75,12 +75,15 @@ from pygnssutils.rinex_helpers import (  # format_timefirstlast,
     format_sto,
     format_time_corr,
     get_epoch,
+    get_epoch_glo,
     get_fithours,
     get_svcode,
+    glotk2sec,
     gpsura2m,
 )
 from pygnssutils.rinex_subframes_bds import BDS_SUBFRAMEACQ_MAP
 from pygnssutils.rinex_subframes_gal import GAL_SUBFRAMEACQ_MAP
+from pygnssutils.rinex_subframes_glo import GLO_SUBFRAMEACQ_MAP
 from pygnssutils.rinex_subframes_gps import GPS_SUBFRAMEACQ_MAP
 
 CLKBIAS = "clkbias"
@@ -268,6 +271,11 @@ class RinexConverterNavigation:
                         sfrmap = BDS_SUBFRAMEACQ_MAP[D2]
                     formatter = self._format_rawnav_bds_d1d2
                     kwargs = {"d1d2": sfrdata.get("d1d2", 0)}
+            elif gnss == GLO:
+                if sigcode in ("1C",):
+                    sfrmap = GLO_SUBFRAMEACQ_MAP[L1OF]
+                    formatter = self._format_rawnav_glo_l1of
+                    kwargs = {"freqid": sfrdata.get("freqid", 0)}
             # elif other gnss/sigcode, as and when I get to it TODO
 
             if sfrmap is None or formatter is None:
@@ -874,8 +882,8 @@ class RinexConverterNavigation:
             raw NAV subframe sources.
         """
 
-        self._navdata[(data.svcode, data.iodc)] = {}
-        nvd = self._navdata[(data.svcode, data.iodc)]
+        self._navdata[(data.svcode, data.iode)] = {}
+        nvd = self._navdata[(data.svcode, data.iode)]
 
         epoch, wn_cont = get_epoch(wno=data.wn, tow=data.tow, gnss=data.gnss)
         self.__app.set_current_epoch(epoch, NAV)
@@ -927,7 +935,7 @@ class RinexConverterNavigation:
 
         if self._rinex_version < RINEX4:
             if self._timecorrflag:
-                self._format_timecorr_3(data)
+                self._format_timecorr_3(data, 2)
             if self._ionocorrflag:
                 self._format_ionocorr_3(data)
         else:  # RINEX 4.02
@@ -953,7 +961,7 @@ class RinexConverterNavigation:
             raw NAV subframe sources.
         """
 
-        self._navdata[(data.svcode, data.top)] = {}  # is top equivalent to iodc here?
+        self._navdata[(data.svcode, data.top)] = {}  # have assumed top => iode
         nvd = self._navdata[(data.svcode, data.top)]
 
         epoch, wn_cont = get_epoch(wno=data.wn, tow=data.tow, gnss=data.gnss)
@@ -1016,7 +1024,7 @@ class RinexConverterNavigation:
 
         if self._rinex_version < RINEX4:
             if self._timecorrflag:
-                self._format_timecorr_3(data)
+                self._format_timecorr_3(data, 2)
             if self._ionocorrflag:
                 self._format_ionocorr_3(data)
         else:  # RINEX 4.02
@@ -1129,7 +1137,7 @@ class RinexConverterNavigation:
 
         if self._rinex_version < RINEX4:
             if self._timecorrflag:
-                self._format_timecorr_3(data)
+                self._format_timecorr_3(data, 5)
             if self._ionocorrflag:
                 self._format_ionocorr_3(data)
         else:  # RINEX 4.02
@@ -1157,8 +1165,8 @@ class RinexConverterNavigation:
         """
 
         d1d2 = kwargs.get("d1d2", 0)
-        self._navdata[(data.svcode, data.aodc)] = {}
-        nvd = self._navdata[(data.svcode, data.aodc)]
+        self._navdata[(data.svcode, data.aode)] = {}
+        nvd = self._navdata[(data.svcode, data.aode)]
 
         epoch, wn_cont = get_epoch(wno=data.wn, tow=data.tow, gnss=data.gnss)
         self.__app.set_current_epoch(epoch, NAV)
@@ -1210,7 +1218,7 @@ class RinexConverterNavigation:
 
         if self._rinex_version < RINEX4:
             if self._timecorrflag:
-                self._format_timecorr_3(data)
+                self._format_timecorr_3(data, 7)
             if self._ionocorrflag:
                 self._format_ionocorr_3(data)
         else:  # RINEX 4.02
@@ -1230,24 +1238,107 @@ class RinexConverterNavigation:
                     data=data,
                 )
 
-    def _format_timecorr_3(self, data: RawNav):
+    def _format_rawnav_glo_l1of(self, data: RawNav, **kwargs):
+        """
+        Format RawNav GLO L1OF (FDMA) broadcast orbit blocks.
+
+        :param RawNav data: RawNav object containing data \
+            collated from UBX RXM-SFRBX messages or other \
+            raw NAV subframe sources.
+        """
+
+        freqid = kwargs.get("freqid", 0)
+        self._navdata[(data.svcode, data.tb)] = {}  # have assumed tb => iode
+        nvd = self._navdata[(data.svcode, data.tb)]
+
+        epoch = get_epoch_glo(data.nt, data.n4, data.tk)
+        nd = (epoch.weekday() + 1) % 7  # GPS week Sunday = 0
+        self.__app.set_current_epoch(epoch, NAV)
+        nvd[EPOCH] = epoch
+        nvd[RECTYPE] = "FDMA"
+        nvd[CLKBIAS] = -data.tauntb  # clock bias (sec)
+        nvd[CLKDRIFT] = data.gammantb  # clock relative freq bias (sec)
+        nvd[CLKRATE] = glotk2sec(data.tk) + (nd * 86400)  # - msg timeframe (s)
+        nvd[BOD] = []
+        nvb = nvd[BOD]
+        for _ in range(4):  # broadcast orbit data blocks * 7
+            nvb.append(["", "", "", ""])  # 4X,4D19.12
+        # BROADCAST ORBIT - 1
+        nvb[0][0] = data.xntb  # - pos (km)
+        nvb[0][1] = data.xntbdot  # - vel (km/s)
+        nvb[0][2] = data.xntbdot2  # - acc (km/s2)
+        nvb[0][3] = (data.bn >> 2) & 0b1  # - health
+        # BROADCAST ORBIT - 2
+        nvb[1][0] = data.yntb  # - pos (km)
+        nvb[1][1] = data.yntbdot  # - vel (km/s)
+        nvb[1][2] = data.yntbdot2  # - acc (km/s2)
+        nvb[1][3] = freqid  # - freq id
+        # BROADCAST ORBIT - 3
+        nvb[2][0] = data.zntb  # - pos (km)
+        nvb[2][1] = data.zntbdot  # - vel (km/s)
+        nvb[2][2] = data.zntbdot2  # - acc (km/s2)
+        nvb[2][3] = data.en  # - age of operation info (days)
+        health = (
+            (data.m << 6)
+            + (data.p4 << 5)
+            + (data.p3 << 4)
+            + (data.p2 << 3)
+            + (data.p1 << 1)
+            + data.p
+        )
+        nvb[3][0] = health  # - health status flags
+        nvb[3][1] = data.deltataun  # - L1/L2 group delay diff (sec)
+        nvb[3][2] = data.ft  # - URAI (GLO-M/K only)
+        nvb[3][3] = data.ln << 2  # - health flags
+
+        if self._rinex_version < RINEX4:
+            if self._timecorrflag:
+                self._format_timecorr_3(data, 3)
+            # if self._ionocorrflag:
+            #     self._format_ionocorr_3(data)
+        else:  # RINEX 4.02
+            if self._timecorrflag:
+                nvd[STO] = self._format_timecorr_4(
+                    msgtype="FDMA",
+                    msgsubtype="",
+                    timecode="GLUT",
+                    utcid="UTC(SU)",
+                    data=data,
+                )
+            # if self._ionocorrflag:
+            #     nvd[ION] = self._format_ionocorr_4(
+            #         msgtype="IFNV", msgsubtype="", model=NEQUICK, data=data
+            #     )
+
+    def _format_timecorr_3(self, data: RawNav, source: int = 0):
         """
         Format RINEX 3 ime correction blocks.
 
         RINEX 3 places these as TIME SYSTEM CORR header lines.
 
         :param RawNav data: data containing time corrections
+        :param int source: time correction source
         """
 
+        if data.gnss == GLO:
+            a0 = -data.tauc
+            a1 = 0
+            timeref = 0
+            weekno = 0
+        else:
+            a0 = data.a0
+            a1 = data.a1
+            timeref = data.toc
+            weekno = data.wn
         timecode = f"{RINEXGNSSR[data.gnss][0:2]}UT"
         self._timecorr[timecode] = format_time_corr(
             corrtype=timecode,
             svcode=data.svcode,
-            source="0",
-            timeref=data.toc,
-            weekno=data.wn,
-            a0=data.a0,
-            a1=data.a1,
+            source=source,
+            timeref=timeref,
+            weekno=weekno,
+            a0=a0,
+            a1=a1,
         )
 
     def _format_timecorr_4(
@@ -1267,7 +1358,18 @@ class RinexConverterNavigation:
         :rtype: str
         """
 
-        epoch, _ = get_epoch(wno=data.wn, tow=data.tow, gnss=data.gnss)
+        if data.gnss == GLO:
+            a0 = -data.tauc
+            a1 = 0
+            a2 = 0
+            epoch = get_epoch_glo(data.nt, data.n4, data.tk)
+            tot = 0
+        else:
+            a0 = data.a0
+            a1 = data.a1
+            a2 = getattr(data, "a2", 0)
+            epoch, _ = get_epoch(wno=data.wn, tow=data.tow, gnss=data.gnss)
+            tot = data.toc
         return format_sto(
             svcode=data.svcode,
             msgtype=msgtype,
@@ -1276,10 +1378,10 @@ class RinexConverterNavigation:
             timecode=timecode,
             sbasid="",
             utcid=utcid,
-            tot=data.toc,
-            a0=data.a0,
-            a1=data.a1,
-            a2=getattr(data, "a2", 0),
+            tot=tot,
+            a0=a0,
+            a1=a1,
+            a2=a2,
         )
 
     def _format_ionocorr_3(self, data: RawNav):

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/rinex_globals.py

@@ -34,6 +34,7 @@ EPOCH0_GPS = datetime(1980, 1, 6, 0, 0, 0, tzinfo=timezone.utc)
 EPOCH0_IRN = datetime(1999, 8, 22, 0, 0, 0, tzinfo=timezone.utc)
 EPOCHMAX = datetime(9999, 12, 31, tzinfo=timezone.utc)
 EPOCHMIN = datetime(1900, 1, 1, tzinfo=timezone.utc)
+FDMA = "FDMA"
 FNAV = "FNAV"
 GAL = "E"
 GLO = "R"
@@ -42,6 +43,8 @@ INAV = "INAV"
 ION = "ION"
 IRN = "I"
 KLOB = "KLOBUCHAR"
+L1OF = "L1OF"
+L2OF = "L2OF"
 LEAPS0 = datetime(1900, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
 LNAV = "LNAV"
 MET = "M"
@@ -51,7 +54,7 @@ NAV = "N"
 NEQUICK = "NEQUICK"
 OBS = "O"
 OMEGADOTREF = -2.6e-9
-PYRINEXCONV_VERSION = "0.1.3 Alpha"
+PYRINEXCONV_VERSION = "0.1.4 Alpha"
 QZS = "J"
 RINEX_CANCELLED = 2
 RINEX_ERROR = 99
@@ -83,6 +86,7 @@ P2_N5 = 0.03125  # 2**-5
 P2_N6 = 0.015625  # 2**-6
 P2_N8 = 0.00390625  # 2**-8
 P2_N9 = 0.001953125  # 2**-9
+P2_N11 = 0.00048828125  # 2**-11
 P2_N14 = 6.103515625e-05  # 2**-14
 P2_N15 = 3.0517578125e-05  # 2**-15
 P2_N16 = 1.52587890625e-05  # 2**-16
@@ -104,6 +108,7 @@ P2_N34 = 5.820766091346741e-11  # 2**-34
 P2_N35 = 2.9103830456733704e-11  # 2**-35
 P2_N37 = 7.275957614183426e-12  # 2**-37
 P2_N38 = 3.637978807091713e-12  # 2**-38
+P2_N40 = 9.094947017729282e-13  # 2**-40
 P2_N43 = 1.1368683772161603e-13  # 2**-43
 P2_N44 = 5.684341886080802e-14  # 2**-44
 P2_N46 = 1.4210854715202004e-14  # 2**-46

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils/rinex_helpers.py

@@ -14,7 +14,7 @@ Created on 6 Oct 2025
 
 # pylint: disable=invalid-name, too-many-arguments, too-many-positional-arguments
 
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from getpass import getuser
 from pathlib import Path
 from types import NoneType
@@ -108,6 +108,61 @@ def get_epoch(
     return epoch, wn
 
 
+def glotk2sec(tk: int) -> int:
+    """
+    Convert GLONASS tk value to seconds.
+
+    :param int tk: GLONASS time
+    :return: seconds
+    :rtype: int
+    """
+
+    hour = (tk >> 7) & 0b11111
+    minute = (tk >> 1) & 0b111111
+    seconds = (tk & 0b1) * 30
+    return (hour * 3600) + (minute * 60) + seconds
+
+
+def get_epoch_glo(nt: int, n4: int, tk: int) -> datetime:
+    """
+    Get epoch from GLONASS day and time attributes.
+
+    See GLONASS ICD A.3.1.3
+
+    :param int nt: number of days in 4 year cycle
+    :param int n4: 4 year cycle number
+    :param int tk: time
+    :return: epoch
+    :rtype: datetime
+    """
+
+    j = 0
+    md = 365
+    if 1 <= nt <= 366:
+        j = 1
+        md = 366
+    elif 367 <= nt <= 731:
+        j = 2
+    elif 732 <= nt <= 1096:
+        j = 3
+    elif 1097 <= nt <= 1461:
+        j = 4
+    year = 1996 + (4 * (n4 - 1)) + (j - 1)
+    basedate = datetime(year, 1, 1, tzinfo=timezone.utc) + timedelta(days=(nt % md) - 2)
+    hour = ((tk >> 7) & 0b11111) - 3  # GLO time 3 hours ahead of UTC
+    minute = (tk >> 1) & 0b111111
+    seconds = (tk & 0b1) * 30
+    return datetime(
+        basedate.year,
+        basedate.month,
+        basedate.day,
+        hour,
+        minute,
+        seconds,
+        tzinfo=timezone.utc,
+    )
+
+
 def get_fithours(iodc: int, fit: int, gnss: str) -> int | str:
     """
     Get FIT interval in hours for given IODC and fit flag.

pygnssutils-1.2.4/src/pygnssutils/rinex_subframes_glo.py

@@ -0,0 +1,136 @@
+"""
+rinex_subframes_glo.py
+
+GLONASS NAV Subframe definitions.
+
+https://web.archive.org/web/20161020203029/http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD_GLONASS_eng_v5.1.pdf
+
+These are provided as the basis of a capability to parse and store
+the payloads of raw NAV subframe messages, via the associated
+`pygnssutils.RawNav` class defined in `rawnav.py`.
+
+NB:
+
+- MSB and LSB fields MUST be suffixed '_msb' and '_lsb' respectively.
+- Non-data bits (reserved, parity, non) MUST be prefixed '_'.
+- Avoid the following reserved field names: gnss, svid, sigid, subframeacq, epoch
+
+Created on 6 Oct 2025
+
+:author: semuadmin (Steve Smith)
+:copyright: semuadmin © 2025
+:license: BSD 3-Clause
+"""
+
+from pygnssutils.rawnav import SID, S, U
+from pygnssutils.rinex_globals import (
+    L1OF,
+    P2_N11,
+    P2_N20,
+    P2_N30,
+    P2_N31,
+    P2_N40,
+    START,
+    TARGET,
+)
+
+# **********************************************************************
+# L1OF (FDMA) - "1C" (same as L2OF - "2C")
+# **********************************************************************
+
+# GLONASS ICD refers to subframes as 'strings'
+
+GLO_L1OF_SUBFRAME_TLM = {
+    "_idle": (0, 1, U, 0),
+    SID: (1, 4, U, 0),  # subframe (string) number
+}
+
+GLO_L1OF_SUBFRAME_END = {
+    "_hamming": (77, 8, U, 0),
+}
+
+# content of 4 32-bit dwrds in RXM-SFRBX payload:
+GLO_SUPERFRAME = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "data": (5, 72, U, 0),
+    **GLO_L1OF_SUBFRAME_END,
+    "_padding1": (85, 11, U, 0),
+    "superframeid": (96, 16, U, 0),
+    "_padding2": (112, 8, U, 0),
+    "frameid": (120, 8, U, 0),
+}
+
+# attribute_name: (bit offset, bit length, bit encoding, scaling)
+GLO_L1OF_SUBFRAME_1 = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "_reserved1": (5, 2, U, 0),
+    "p1": (7, 2, U, 1),
+    "tk": (9, 12, U, 0),
+    # "tk_hours": (9, 5, U, 0),
+    # "tk_mins": (14, 6, U, 0),
+    # "tk_secs": (20, 1, U, 30),
+    "xntbdot": (21, 24, S, P2_N20),
+    "xntbdot2": (45, 5, S, P2_N30),
+    "xntb": (50, 27, S, P2_N11),
+    **GLO_L1OF_SUBFRAME_END,
+}
+GLO_L1OF_SUBFRAME_2 = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "bn": (5, 3, U, 0),
+    "p2": (8, 1, U, 1),
+    "tb": (9, 7, U, 15),
+    "_reserved1": (16, 5, U, 0),
+    "yntbdot": (21, 24, S, P2_N20),
+    "yntbdot2": (45, 5, S, P2_N30),
+    "yntb": (50, 27, S, P2_N11),
+    **GLO_L1OF_SUBFRAME_END,
+}
+GLO_L1OF_SUBFRAME_3 = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "p3": (5, 1, U, 1),
+    "gammantb": (6, 11, S, P2_N40),
+    "_reserved1": (17, 1, U, 0),
+    "p": (18, 2, U, 1),
+    "ln": (20, 1, U, 1),
+    "zntbdot": (21, 24, S, P2_N20),
+    "zntbdot2": (45, 5, S, P2_N30),
+    "zntb": (50, 27, S, P2_N11),
+    **GLO_L1OF_SUBFRAME_END,
+}
+GLO_L1OF_SUBFRAME_4 = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "tauntb": (5, 22, S, P2_N30),
+    "deltataun": (27, 5, S, P2_N30),
+    "en": (32, 5, U, 1),
+    "_reserved1": (37, 14, U, 0),
+    "p4": (51, 1, U, 1),
+    "ft": (52, 4, U, 0),
+    "_reserved2": (56, 3, U, 0),
+    "nt": (59, 11, U, 0),
+    "n": (70, 5, U, 0),
+    "m": (75, 2, U, 0),  # 0 = GLONASS, 1 = GLONASS-M
+    **GLO_L1OF_SUBFRAME_END,
+}
+GLO_L1OF_SUBFRAME_5 = {
+    **GLO_L1OF_SUBFRAME_TLM,
+    "na": (5, 11, S, P2_N30),
+    "tauc": (16, 32, S, P2_N31),
+    "_reserved1": (48, 1, U, 0),
+    "n4": (49, 5, U, 1),
+    "taugps": (54, 22, S, P2_N30),
+    "ln": (76, 1, U, 0),
+    **GLO_L1OF_SUBFRAME_END,
+}
+
+# mapping for (subframe, page) acquisition mask subframeacq
+GLO_SUBFRAMEACQ_MAP = {
+    L1OF: {
+        TARGET: 0b11111,  # subframes 1,2,3,4,5
+        START: 1,
+        (1, 0): (GLO_L1OF_SUBFRAME_1, 1),
+        (2, 0): (GLO_L1OF_SUBFRAME_2, 2),
+        (3, 0): (GLO_L1OF_SUBFRAME_3, 4),
+        (4, 0): (GLO_L1OF_SUBFRAME_4, 8),
+        (5, 0): (GLO_L1OF_SUBFRAME_5, 16),
+    },
+}

{pygnssutils-1.2.3 → pygnssutils-1.2.4/src/pygnssutils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygnssutils
-Version: 1.2.3
+Version: 1.2.4
 Summary: GNSS Command Line Utilities
 Author-email: Steve Smith <semuadmin@semuconsulting.com>
 Maintainer-email: Steve Smith <semuadmin@semuconsulting.com>
@@ -35,10 +35,10 @@ Requires-Dist: paho-mqtt>=2.1.0
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pyspartn>=1.0.8
 Requires-Dist: pyubx2>=1.3.3
-Requires-Dist: pynmeagps>=1.1.4
+Requires-Dist: pynmeagps>=1.1.5
 Requires-Dist: pysbf2>=1.0.4
 Requires-Dist: pyubxutils>=1.0.6
-Requires-Dist: pyqgc>=0.2.2
+Requires-Dist: pyqgc>=1.0.0
 Requires-Dist: pyunigps>=1.0.0
 Dynamic: license-file
 
@@ -81,7 +81,7 @@ designated output stream.
 a simple SPARTN IP (MQTT) Client which receives SPARTN correction data from an SPARTN IP location service and (optionally) sends this to a
 designated output stream.
 1. `SocketServer` class based on the native Python `ThreadingTCPServer`. Capable of operating in two modes - Socket Server or NTRIP Caster. Provides two alternate client request handler classes - `ClientHandler` (HTTP) or `ClientHandlerTLS` (HTTPS).
-1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: this initial ALPHA release has limited functionality.**
+1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental work in progress (*contributions and feedback welcome*)**
 
 The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnssutils](https://github.com/semuconsulting/pygnssutils).
 
@@ -543,15 +543,15 @@ class pygnssutils.rinex_conv.RinexConvertor(app, rinex_version, rinex_type, gnss
 
 A command line utility and Python class `RinexConverter` to convert binary GNSS data logs to RINEX text file format.
 
-**NB: The current ALPHA release implements the following functionality:**
+**NB: RINEX conversion is an experimental work in progress (*contributions and feedback welcome*). The current ALPHA release implements the following functionality:**
 
 1. RINEX versions 3.05 and 4.02.
 1. Convert binary UBX RXM-RAW or RXM-RAWX (raw observation) data from u-blox receivers (e.g. ZED-F9P) to RINEX Observation file format.
-1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
+1. Convert binary RXM-SFRBX (navigation subframe) data from u-blox receivers to RINEX Navigation file format. **Currently supports GPS LNAV/CNAV, GAL FNAV/INAV, BDS D1/D2 & GLO L1OF**, but the underlying `RinexConverterNavigation` class will be enhanced in future releases.
 1. Convert RTCM3 Ephemerides messages (1019, 1020, 1041-1046) from any source (including NTRIP caster or RTK base station receiver) to RINEX Navigation file format.
 1. Convert NMEA MWD (wind speed and direction) and XDR (temperature and pressure) sensor data to RINEX Meteorology file format.
 
-A Graphical User Interface for this utility will be added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
+A Graphical User Interface for this utility has been added to [PyGPSClient](https://github.com/semuconsulting/PyGPSClient).
 
 Assuming the u-blox receiver is already configured to output raw observation (UBX-RXM-RAWX) and navigation subframe (UBX-RXM-SFRBX) data, a suitable input log file can be created using the pygnssutils `gnssstreamer` CLI utility e.g. ...
 

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/pygnssutils/rinex_globals.py
 src/pygnssutils/rinex_helpers.py
 src/pygnssutils/rinex_subframes_bds.py
 src/pygnssutils/rinex_subframes_gal.py
+src/pygnssutils/rinex_subframes_glo.py
 src/pygnssutils/rinex_subframes_gps.py
 src/pygnssutils/socket_server.py
 src/pygnssutils.egg-info/PKG-INFO

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/src/pygnssutils.egg-info/requires.txt

@@ -3,8 +3,8 @@ paho-mqtt>=2.1.0
 pyserial>=3.5
 pyspartn>=1.0.8
 pyubx2>=1.3.3
-pynmeagps>=1.1.4
+pynmeagps>=1.1.5
 pysbf2>=1.0.4
 pyubxutils>=1.0.6
-pyqgc>=0.2.2
+pyqgc>=1.0.0
 pyunigps>=1.0.0

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/tests/test_rinex.py

@@ -13,7 +13,6 @@ Created on 26 May 2022
 import unittest
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
-from platform import system
 from time import sleep
 
 from pygnssutils.rinex_conv import RinexConverter
@@ -21,9 +20,6 @@ from pygnssutils.rinex_globals import BDS, EPOCH0_GPS, EPOCHMAX, EPOCHMIN, GAL,
 from pygnssutils.rinex_helpers import (
     DRNX,
     FRNX,
-    get_epoch,
-    get_svcode_ubx,
-    get_svcode,
     adjust_time_units,
     format_antennabsight,
     format_antennadeltahen,
@@ -36,24 +32,27 @@ from pygnssutils.rinex_helpers import (
     format_clockoffset,
     format_cnrunit,
     format_comments,
+    format_eop,
     format_fileend,
     format_filename,
     format_glonassfrq,
     format_glonassphasebias,
     format_headerend,
     format_interval,
-    format_eop,
+    format_ion,
     format_iono_corr,
     format_leapseconds,
     format_marker,
     format_met_obstypes,
     format_met_sensorpos,
     format_met_sensortype,
+    format_nav_typesvmssg,
     format_numsats,
     format_observer,
     format_obstypes,
     format_rcvrtype,
     format_runby,
+    format_sto,
     format_sys_antennaphasecentre,
     format_sys_dcbsapplied,
     format_sys_pcvsapplied,
@@ -62,11 +61,13 @@ from pygnssutils.rinex_helpers import (
     format_time_corr,
     format_timefirstlast,
     format_version,
-    format_nav_typesvmssg,
-    listify,
-    format_sto,
-    format_ion,
+    get_epoch,
+    get_epoch_glo,
+    get_svcode,
+    get_svcode_ubx,
     gpsura2m,
+    glotk2sec,
+    listify,
 )
 
 SENSORTYPES = {
@@ -133,7 +134,7 @@ SENSORTYPES = {
 }
 
 # only run RINEX file tests locally
-RINEXFILETEST = False # system() == "Darwin"
+RINEXFILETEST = False  # system() == "Darwin"
 
 
 class StaticTest(unittest.TestCase):
@@ -166,22 +167,22 @@ class StaticTest(unittest.TestCase):
         self.assertEqual(DRNX(" ", 14, 8), "              ")
 
     def testgetsvcodeubx(self):
-        self.assertEqual(get_svcode_ubx(0,3),"G03")
-        self.assertEqual(get_svcode_ubx(0,3,False),"G 3")
-        self.assertEqual(get_svcode_ubx(2,12),"E12")
-        self.assertEqual(get_svcode_ubx(2,12,False),"E12")
-        self.assertEqual(get_svcode_ubx(1,112),"S12")
-        self.assertEqual(get_svcode_ubx(1,112,False),"S12")
-        self.assertEqual(get_svcode_ubx(5,194),"J02")
-        self.assertEqual(get_svcode_ubx(5,194,False),"J 2")
+        self.assertEqual(get_svcode_ubx(0, 3), "G03")
+        self.assertEqual(get_svcode_ubx(0, 3, False), "G 3")
+        self.assertEqual(get_svcode_ubx(2, 12), "E12")
+        self.assertEqual(get_svcode_ubx(2, 12, False), "E12")
+        self.assertEqual(get_svcode_ubx(1, 112), "S12")
+        self.assertEqual(get_svcode_ubx(1, 112, False), "S12")
+        self.assertEqual(get_svcode_ubx(5, 194), "J02")
+        self.assertEqual(get_svcode_ubx(5, 194, False), "J 2")
 
     def testgetsvcodertcm(self):
-        self.assertEqual(get_svcode("G",3),"G03")
-        self.assertEqual(get_svcode("G",3,None, False),"G 3")
-        self.assertEqual(get_svcode("S",112-100),"S12")
-        self.assertEqual(get_svcode("S",112-100,None, False),"S12")
-        self.assertEqual(get_svcode("J",194-192),"J02")
-        self.assertEqual(get_svcode("J",194-192,None, False),"J 2")
+        self.assertEqual(get_svcode("G", 3), "G03")
+        self.assertEqual(get_svcode("G", 3, None, False), "G 3")
+        self.assertEqual(get_svcode("S", 112 - 100), "S12")
+        self.assertEqual(get_svcode("S", 112 - 100, None, False), "S12")
+        self.assertEqual(get_svcode("J", 194 - 192), "J02")
+        self.assertEqual(get_svcode("J", 194 - 192, None, False), "J 2")
 
     def testformat_filename(self):
         firstobs = datetime(2026, 3, 14, 12, 4, 6)
@@ -206,13 +207,13 @@ class StaticTest(unittest.TestCase):
         )
         firstobs = datetime(2026, 3, 14, 12, 4, 6)
         lastobs = firstobs + timedelta(minutes=60)
-        interval=15
+        interval = 15
         res = format_filename(
-            rinextype="O", 
+            rinextype="O",
             gnssfilter=[GPS],
-            startepoch=firstobs, 
+            startepoch=firstobs,
             endepoch=lastobs,
-            interval=interval, 
+            interval=interval,
             outputpath=Path("/Users/steve/Downloads"),
             form="IGS",
             site="SITE",
@@ -226,9 +227,30 @@ class StaticTest(unittest.TestCase):
         )
 
     def test_getepoch(self):
-        res = get_epoch(366,411634,"G")
+        res = get_epoch(366, 411634, "G")
+        # print(res)
+        self.assertEqual(
+            res, (datetime(2026, 4, 16, 18, 20, 34, tzinfo=timezone.utc), 2414)
+        )
+
+    def test_glotk2sec(self):
+        res = glotk2sec(1584)
+        # print(res)
+        self.assertEqual(res, 44640)
+        res = glotk2sec(1585)
+        # print(res)
+        self.assertEqual(res, 44670)
+        res = glotk2sec(1586)
         # print(res)
-        self.assertEqual(res, (datetime(2026, 4, 16, 18, 20, 34, tzinfo=timezone.utc), 2414))
+        self.assertEqual(res, 44700)
+
+    def test_getepochglo(self):
+        res = get_epoch_glo(884, 8, 1584)
+        # print(res)
+        self.assertEqual(res, datetime(2026, 6, 2, 9, 24, 0, tzinfo=timezone.utc))
+        res = get_epoch_glo(884, 8, 1646)
+        # print(res)
+        self.assertEqual(res, (datetime(2026, 6, 2, 9, 55, 0, tzinfo=timezone.utc)))
 
     def testformat_antennabsight(self):
         res = format_antennabsight()
@@ -346,7 +368,7 @@ class StaticTest(unittest.TestCase):
             "GPSB   1.2481e-07  5.0391e-06  2.3771e-07  1.2346e-13 B 14  IONOSPHERIC CORR\n"
         )
         res = format_iono_corr(
-            svid=2, 
+            svid=2,
             timemark="A",
             corrtype="GPSA",
             parm1=0.00000012481234567890,
@@ -355,7 +377,7 @@ class StaticTest(unittest.TestCase):
             parm4=0.00000000000012345678909,
         )
         res += format_iono_corr(
-            svid=14, 
+            svid=14,
             timemark="B",
             corrtype="GPSB",
             parm1=0.00000012481234567890,
@@ -369,7 +391,7 @@ class StaticTest(unittest.TestCase):
     def testformat_ion(self):
         EXPECTED_RESULT = (
             "> ION G24 LNAV XXXX\n"
-            "    2026 05 13 08 34 02 1.234567000000e-12 1.234567000000e-12-1.234567000000e-12\n"      
+            "    2026 05 13 08 34 02 1.234567000000e-12 1.234567000000e-12-1.234567000000e-12\n"
             "     1.234567000000e-12 1.234567000000e-12 1.234567000000e-12-1.234567000000e-12\n"
             "     1.234567000000e-12\n"
         )
@@ -377,7 +399,7 @@ class StaticTest(unittest.TestCase):
             svcode="G24",
             msgtype="LNAV",
             msgsubtype="XXXX",
-            epoch=datetime(2026,5,13,8,34,2,tzinfo=timezone.utc),
+            epoch=datetime(2026, 5, 13, 8, 34, 2, tzinfo=timezone.utc),
             a0=1.234567e-12,
             a1=1.234567e-12,
             a2=-1.234567e-12,
@@ -387,13 +409,13 @@ class StaticTest(unittest.TestCase):
             b2=-1.234567e-12,
             b3=1.234567e-12,
         )
-        #print(res)
+        # print(res)
         self.assertEqual(res, EXPECTED_RESULT)
 
     def testformat_eop(self):
         EXPECTED_RESULT = (
             "> EOP G24 LNAV XXXX\n"
-            "    2026 05 13 08 34 02 2.082471847534e-01-6.551742553711e-04 0.000000000000e+00\n"      
+            "    2026 05 13 08 34 02 2.082471847534e-01-6.551742553711e-04 0.000000000000e+00\n"
             "                        3.444433212280e-01-9.121894836426e-04 0.000000000000e+00\n"
             "     1.729860000000e+05-1.754972934723e-01 5.635917186737e-04 0.000000000000e+00\n"
         )
@@ -401,17 +423,17 @@ class StaticTest(unittest.TestCase):
             svcode="G24",
             msgtype="LNAV",
             msgsubtype="XXXX",
-            epoch=datetime(2026,5,13,8,34,2,tzinfo=timezone.utc),
-            tom=1.729860000000e+05,
+            epoch=datetime(2026, 5, 13, 8, 34, 2, tzinfo=timezone.utc),
+            tom=1.729860000000e05,
             xp=2.082471847534e-01,
             dxpdt=-6.551742553711e-04,
-            dxpdt2=0.000000000000e+00,
+            dxpdt2=0.000000000000e00,
             yp=3.444433212280e-01,
             dypdt=-9.121894836426e-04,
-            dypdt2=0.000000000000e+00,
+            dypdt2=0.000000000000e00,
             deltaut1=-1.754972934723e-01,
             ddeltaut1dt=5.635917186737e-04,
-            d2deltaut1dt2=0.000000000000e+00,
+            d2deltaut1dt2=0.000000000000e00,
         )
         print(res)
         self.assertEqual(res, EXPECTED_RESULT)
@@ -425,33 +447,32 @@ class StaticTest(unittest.TestCase):
             weekno=1849,
             source="5",
             a0=0.000000003725290298,
-            a1=0.00000000000000532907052
+            a1=0.00000000000000532907052,
         )
         # print(res)
         self.assertEqual(res, EXPECTED_RESULT)
 
-
     def testformat_sto(self):
         EXPECTED_RESULT = (
             "> STO G24 LNAV XXXX\n"
-            "    2026 05 13 08 34 02 GPUT               SSSS               UTC(USNO)         \n"      
+            "    2026 05 13 08 34 02 GPUT               SSSS               UTC(USNO)         \n"
             "     4.567890000000e+05 1.234567000000e-23 1.234567000000e-23-1.234567800000e-12\n"
         )
         res = format_sto(
             svcode="G24",
             msgtype="LNAV",
             msgsubtype="XXXX",
-            epoch=datetime(2026,5,13,8,34,2,tzinfo=timezone.utc),
+            epoch=datetime(2026, 5, 13, 8, 34, 2, tzinfo=timezone.utc),
             timecode="GPUT",
             sbasid="SSSS",
             utcid="UTC(USNO)",
             tot=456789,
             a0=1.234567e-23,
             a1=1.234567e-23,
-            a2=-1.2345678e-12
+            a2=-1.2345678e-12,
         )
         # print(res)
-        self.assertEqual(res,EXPECTED_RESULT)
+        self.assertEqual(res, EXPECTED_RESULT)
 
     def testformat_met_obstypes(self):
         EXPECTED_RESULT = (
@@ -514,16 +535,16 @@ class StaticTest(unittest.TestCase):
 
     def testgpsura2m(self):
 
-        self.assertEqual(gpsura2m(1),2.8)
-        self.assertEqual(gpsura2m(2),4.0)
-        self.assertEqual(gpsura2m(3),5.7)
-        self.assertEqual(gpsura2m(5),11.3)
-        self.assertEqual(gpsura2m(8),64)
-        self.assertEqual(gpsura2m(14),4096)
-        self.assertEqual(gpsura2m(15),0)
-        self.assertEqual(gpsura2m(-16),0)
-        self.assertEqual(gpsura2m(-8),0.1)
-    
+        self.assertEqual(gpsura2m(1), 2.8)
+        self.assertEqual(gpsura2m(2), 4.0)
+        self.assertEqual(gpsura2m(3), 5.7)
+        self.assertEqual(gpsura2m(5), 11.3)
+        self.assertEqual(gpsura2m(8), 64)
+        self.assertEqual(gpsura2m(14), 4096)
+        self.assertEqual(gpsura2m(15), 0)
+        self.assertEqual(gpsura2m(-16), 0)
+        self.assertEqual(gpsura2m(-8), 0.1)
+
     def testrinexnav(self):
         EXPECTED_RESULT_OBS = [
             r"     3.05           O: OBSERVATION      M: MIXED            RINEX VERSION / TYPE\n",

{pygnssutils-1.2.3 → pygnssutils-1.2.4}/tests/test_rinex_defs.py

@@ -6,17 +6,17 @@ length are consistent with ICD definition.
 
 Created on 26 May 2022
 
-*** NB: must be saved in UTF-8 format ***
-
 @author: semuadmin
 """
 
 import unittest
 
-from pygnssutils.rawnav import VALPREAMBLE
-import pygnssutils.rinex_subframes_gps as gps
-import pygnssutils.rinex_subframes_gal as gal
 import pygnssutils.rinex_subframes_bds as bds
+import pygnssutils.rinex_subframes_gal as gal
+import pygnssutils.rinex_subframes_glo as glo
+import pygnssutils.rinex_subframes_gps as gps
+from pygnssutils.rawnav import VALPREAMBLE
+
 
 class StaticTest(unittest.TestCase):
     def setUp(self):
@@ -48,7 +48,7 @@ class StaticTest(unittest.TestCase):
             gps.GPS_LNAV_SUBFRAME_4_P18,
         )
         sfrlen = 300
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
     def testGPSCNAVdefs(self):
         sfrdefs = (
@@ -66,10 +66,10 @@ class StaticTest(unittest.TestCase):
             gps.GPS_CNAV_SUBFRAME_35,
             gps.GPS_CNAV_SUBFRAME_36,
             gps.GPS_CNAV_SUBFRAME_37,
-            gps.GPS_CNAV_SUBFRAME_40
+            gps.GPS_CNAV_SUBFRAME_40,
         )
         sfrlen = 300
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
     def testGALFNAV(self):
 
@@ -79,16 +79,16 @@ class StaticTest(unittest.TestCase):
             gal.GAL_FNAV_SUBFRAME_3,
             gal.GAL_FNAV_SUBFRAME_4,
             gal.GAL_FNAV_SUBFRAME_5,
-            gal.GAL_FNAV_SUBFRAME_6
+            gal.GAL_FNAV_SUBFRAME_6,
         )
         sfrlen = 244
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
     def testGALINAV(self):
-    
+
         sfrdefs = (gal.GAL_INAV_SUBFRAME,)
         sfrlen = 256
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
         sfrdefs = (
             gal.GAL_INAV_WORD_1,
@@ -101,10 +101,10 @@ class StaticTest(unittest.TestCase):
             gal.GAL_INAV_WORD_8,
             gal.GAL_INAV_WORD_9,
             gal.GAL_INAV_WORD_10,
-            gal.GAL_INAV_WORD_16
+            gal.GAL_INAV_WORD_16,
         )
         sfrlen = 128
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
     def testBDSD1(self):
 
@@ -116,7 +116,7 @@ class StaticTest(unittest.TestCase):
             bds.BDS_D1_SUBFRAME_5_P10,
         )
         sfrlen = 300
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
 
     def testBDSD2(self):
 
@@ -133,4 +133,16 @@ class StaticTest(unittest.TestCase):
             bds.BDS_D2_SUBFRAME_1_P10,
         )
         sfrlen = 300
-        self.scandefs(sfrdefs,sfrlen)
+        self.scandefs(sfrdefs, sfrlen)
+
+    def testGLOL1OF(self):
+
+        sfrdefs = (
+            glo.GLO_L1OF_SUBFRAME_1,
+            glo.GLO_L1OF_SUBFRAME_2,
+            glo.GLO_L1OF_SUBFRAME_3,
+            glo.GLO_L1OF_SUBFRAME_4,
+            glo.GLO_L1OF_SUBFRAME_5,
+        )
+        sfrlen = 85
+        self.scandefs(sfrdefs, sfrlen)