- added rtcm ssr decoder.

Author: hirokawa

receiver/decode_jps.py

@@ -398,6 +398,8 @@ def decode_obs(self):
         obs.D[np.isnan(obs.D)] = 0
         obs.S[np.isnan(obs.S)] = 0
 
+        obs.sort()
+
         return obs
 
     def decode_nd(self, buff, sys=uGNSS.GPS):

receiver/decode_rtcm.py

@@ -103,7 +103,10 @@ def __init__(self, opt=None, prefix='', gnss_t='GECJ'):
                 uTYP.S: [rSigRnx('IS5A'), rSigRnx('IS1X')],
             }
 
-        self.rtcm = rtcm()
+        if opt is not None:
+            foutname = opt.foutname
+
+        self.rtcm = rtcm(foutname=foutname)
         self.time_p = gtime_t()
         self.obs = None
 
@@ -164,19 +167,8 @@ def init_obs(self, time):
         self.obs.sat = np.empty(0, dtype=int)
         self.obs.sig = {}
 
-       #     if tow_p > 0 and tow_p != obs.tow:
-       #         flg_head = True
-       #         k = 0
-       #         f.seek(0)
-
-       #     tow_p = obs.tow
-
-       #     if not flg_head:
-       #         for sys in self.sig:
-       #             self.re.sig_tab[sys] = self.sig[sys]
-       # self.re.rnx_obs_header_sent
-
     def decode(self, buff, len_, sys=[], prn=[]):
+        """ decode RTCM binary messages """
 
         _, obs, eph, geph, seph = self.rtcm.decode(buff, len_)
 
@@ -221,7 +213,7 @@ def decode(f, opt, args):
     prefix = fname[4:].removesuffix('.rtcm3')+'_'
     prefix = str(Path(bdir) / prefix) if bdir else prefix
     rtcmdec = rtcmDec(opt=opt, prefix=prefix, gnss_t=args.gnss)
-    rtcmdec.monlevel = 1
+    rtcmdec.monlevel = 2
 
     rtcmdec.rtcm.week = args.weekref
 
@@ -250,6 +242,8 @@ def decode(f, opt, args):
 
     rtcmdec.file_close()
 
+# python decode_rtcm.py ..\data\doy2025-298\CL07298j.rtc --weekref=2389
+
 
 def main():
 
@@ -285,6 +279,9 @@ def main():
     opt.flg_rnxobs = True
     opt.flg_rnxnav = True
 
+    s = args.inpFileName
+    opt.foutname = s[:s.rfind('.')]+'.log'
+
     # Start processing pool
     #
     with mp.Pool(processes=args.jobs) as pool:

receiver/decode_sbf.py

@@ -260,22 +260,22 @@ def decode_obs(self, buff, k=8):
                 else:
                     S1 = cn0*0.25 + 10.0
 
-            if code not in self.sig_tab[sys][code.typ]:
-                if self.monlevel > 1:
-                    print("skip code={:}".format(code))
-                k += nb2*sb2len
-                continue
-            idx = self.sig_tab[sys][code.typ].index(code)
+            if code in self.sig_tab[sys][code.typ]:
+                idx = self.sig_tab[sys][code.typ].index(code)
 
-            pr[idx] = P1
-            cp[idx] = L1
-            dp[idx] = D1
-            ll[idx] = lli
-            cn[idx] = S1
+                pr[idx] = P1
+                cp[idx] = L1
+                dp[idx] = D1
+                ll[idx] = lli
+                cn[idx] = S1
 
-            if self.monlevel >= 2:
-                print("{:6d} {:3d} {:} {:14.3f} {:14.3f} {:10.3f} {:4.2f}".
-                      format(int(self.tow), prn, code, P1, L1, D1, S1))
+                if self.monlevel >= 2:
+                    print("{:6d} {:3d} {:} {:14.3f} {:14.3f} {:10.3f} {:4.2f}".
+                          format(int(self.tow), prn, code, P1, L1, D1, S1))
+
+            else:
+                if self.monlevel > 1:
+                    print("skip code={:}".format(code))
 
             for j in range(nb2):
                 typ, ltime, cn0, ofst1, cp1, info, cofst0, cp0, dop0 = \
@@ -350,6 +350,8 @@ def decode_obs(self, buff, k=8):
         obs.S = obs.S.reshape(len(obs.sat), self.nsig[uTYP.S])
         obs.lli = obs.lli.reshape(len(obs.sat), self.nsig[uTYP.L])
 
+        obs.sort()
+
         return obs
 
     def decode_gpsnav(self, buff, k=8):