- added correction message decoded from Mosaic-X5 (Javad DELTA-3S for…

… QZSS L6).
hirokawa · Feb 24, 2025 · 9a6a81a · 9a6a81a
1 parent ca87c2e
commit 9a6a81a
Show file tree

Hide file tree

Showing 13 changed files with 298,868 additions and 29 deletions.
diff --git a/data/doy2025-046/046r_bdsb2b.txt b/data/doy2025-046/046r_bdsb2b.txt
diff --git a/data/doy2025-046/046r_gale6.txt b/data/doy2025-046/046r_gale6.txt
diff --git a/data/doy2025-046/046r_qzsl6.txt b/data/doy2025-046/046r_qzsl6.txt
diff --git a/data/doy2025-046/046r_rnx.nav b/data/doy2025-046/046r_rnx.nav
diff --git a/data/doy2025-046/046r_rnx.obs b/data/doy2025-046/046r_rnx.obs
diff --git a/data/doy2025-046/046r_sbas.txt b/data/doy2025-046/046r_sbas.txt
diff --git a/receiver/decode_jps.py b/receiver/decode_jps.py
@@ -917,8 +917,8 @@ def decode(self, buff, len_, sys=[], prn=[]):
 
     year = 2023
 
-    bdir = '../data/doy2025-020/'
-    fnames = 'jav3020?.jps'
+    bdir = '../data/doy2025-046/'
+    fnames = 'jav3046r.jps'
 
     opt = rcvOpt()
     opt.flg_qzsl6 = True

diff --git a/receiver/decode_sbf.py b/receiver/decode_sbf.py
@@ -1006,10 +1006,10 @@ def decode(self, buff, len_, sys=[], prn=[]):
     gnss_t = 'GERCJ'
 
     bdir = '../data/doy2025-046/'
-    fnames = 'sept046r.sbf'
+    fnames = 'sep3046q.sbf'
 
     opt = rcvOpt()
-    opt.flg_qzsl6 = True
+    opt.flg_qzsl6 = False
     opt.flg_qzslnav = True
     opt.flg_gpslnav = True
     opt.flg_qzscnav = True

diff --git a/samples/test_pppbds.py b/samples/test_pppbds.py
@@ -37,7 +37,7 @@
     xyz_ref = [-3962108.7007, 3381309.5532, 3668678.6648]
 else:
     ep = [2025, 2, 15, 13, 0, 0]
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
     # navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
     navfile = '../data/doy2025-046/046n_rnx.nav'  # Mosaic-X5
     obsfile = '../data/doy2025-046/046n_rnx.obs'  # Mosaic-X5

diff --git a/samples/test_ppphas.py b/samples/test_ppphas.py
@@ -44,14 +44,11 @@
     obsfile = '../data/doy223/SEPT223Y.23O'  # PolaRX5
     file_has = '../data/doy223/223v_gale6.txt'
 elif dataset == 2:
-    ep = [2025, 2, 15, 13, 0, 0]
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
-    # navfile = '../data/doy2025-046/SEPT0462.25P'
-    # navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
-    navfile = '../data/doy2025-046/046n_rnx.nav'  # Mosaic-X5
-    obsfile = '../data/doy2025-046/046n_rnx.obs'  # Mosaic-X5
-    # obsfile = '../data/doy2025-046/SEPT0460.25O'
-    file_has = '../data/doy2025-046/046n_gale6.txt'
+    ep = [2025, 2, 15, 17, 0, 0]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
+    navfile = '../data/doy2025-046/046r_rnx.nav'  # Mosaic-X5
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
+    file_has = '../data/doy2025-046/046r_gale6.txt'
 
 
 # Convert epoch and user reference position

diff --git a/samples/test_pppmdc.py b/samples/test_pppmdc.py
@@ -37,18 +37,18 @@
     file_l6 = '../data/doy223/223v_qzsl6.txt'
     xyz_ref = [-3962108.7007, 3381309.5532, 3668678.6648]
 else:
-    ep = [2025, 2, 15, 13, 0, 0]
-    navfile = '../data/doy2025-046/046n_rnx.nav'
+    ep = [2025, 2, 15, 17, 0, 0]
+    # navfile = '../data/doy2025-046/046r_rnx.nav'
     # navfile = '../data/doy2025-046/SEPT0462.25P'
-    # navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
-    obsfile = '../data/doy2025-046/046n_rnx.obs'  # Mosaic-X5
+    navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
     # obsfile = '../data/doy2025-046/SEPT0460.25O'
-    file_l6 = '../data/doy2025-046/046n_qzsl6.txt'
+    file_l6 = '../data/doy2025-046/046r_qzsl6.txt'
     # navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
     # obsfile = '../data/doy2025-046/jav3046n.25o'  # Javad DELTA-3S
     # navfile = '../data/doy2025-046/SEPT0463.25P'
     # obsfile = '../data/doy2025-046/SEPT0463.25O'  # PolaRX5
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
 
 time = epoch2time(ep)
 year = ep[0]

diff --git a/samples/test_ppppvs.py b/samples/test_ppppvs.py
@@ -33,7 +33,7 @@
     # xyz_ref = [-3962108.7007, 3381309.5532, 3668678.6648]
 
     ep = [2025, 2, 15, 13, 0, 0]
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
     navfile = '../data/doy2025-046/046n_rnx.nav'  # Mosaic-X5
     obsfile = '../data/doy2025-046/046n_rnx.obs'  # Mosaic-X5
     file_pvs = '../data/doy2025-046/046n_sbas.txt'  # Mosaic-X5

diff --git a/samples/test_ppprtk.py b/samples/test_ppprtk.py
@@ -26,9 +26,10 @@
     l6file = '../data/2021078M.l6'
 
     ep = [2025, 2, 15, 17, 0, 0]
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
     navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
-    obsfile = '../data/doy2025-046/sept046r.obs'  # Mosaic-X5
+    # obsfile = '../data/doy2025-046/sept046r.obs'  # PoLaRx5
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
     l6file = '../data/doy2025-046/2025046R.l6'
 
 
@@ -39,13 +40,10 @@
     obsfile = '../data/doy223/SEPT223Y.23O'  # PolaRX5
     file_l6 = '../data/doy223/223v_qzsl6.txt'
 else:
-    ep = [2025, 2, 15, 13, 0, 0]
-    xyz_ref = [-3962108.6104, 3381309.5047, 3668678.6026]
-    # navfile = '../data/doy2025-046/046n_rnx.nav'  # Mosaic-X5
-    navfile = '../data/doy2025-046/BRD400DLR_S_20250460000_01D_MN.rnx'
-    # obsfile = '../data/doy2025-046/046m_rnx.obs'  # Mosaic-X5
-    # navfile = '../data/doy2025-046/SEPT0463.25P'
-    obsfile = '../data/doy2025-046/SEPT0463.25O'  # PolaRX5
+    ep = [2025, 2, 15, 17, 0, 0]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
+    navfile = '../data/doy2025-046/046r_rnx.nav'  # Mosaic-X5
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
     file_l6 = '../data/doy2025-046/046n_qzsl6.txt'
 
 prn_ref = 199  # QZSS PRN