- signal ID in dump file for Septentrio translated into GREIS.

hirokawa · Dec 1, 2024 · 1c7d283 · 1c7d283
1 parent 2c14831
commit 1c7d283
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/receiver/decode_jps.py b/receiver/decode_jps.py
@@ -497,11 +497,17 @@ def decode(self, buff, len_, sys=[], prn=[]):
                         .format(self.week, time_, prn, type_, len_,
                                 hexlify(b).decode()))
             elif type_ == 1:  # FNAV
+                b = buff[12:]
                 if self.flg_rnxnav:
                     eph = self.rn.decode_gal_fnav(
-                        self.week, time_, sat, type_, buff[12:])
+                        self.week, time_, sat, type_, b)
                     if eph is not None:
                         self.re.rnx_nav_body(eph, self.fh_rnxnav)
+                if self.flg_galfnav and self.week >= 0:
+                    self.fh_galfnav.write(
+                        "{:4d}\t{:6d}\t{:3d}\t{:1d}\t{:3d}\t{:s}\n"
+                        .format(self.week, time_, prn, type_, len_,
+                                hexlify(b).decode()))
             elif type_ == 6:  # CNAV
                 if self.flg_gale6 and self.week >= 0:
                     self.fh_gale6.write(

diff --git a/receiver/decode_sbf.py b/receiver/decode_sbf.py
@@ -619,6 +619,11 @@ def decode(self, buff, len_, sys=[], prn=[]):
             crcpass, cnt, src, freq, ch = st.unpack_from('<BBBBB', buff, k)
             k += 5
             if self.flg_galfnav:
+                if src & 0x1f == 20:  # E5a
+                    type_ = 1
+                else:
+                    return -1
+
                 if crcpass != 1:
                     if self.monlevel > 0:
                         print("crc error in GALRawFNAV " +
@@ -629,7 +634,7 @@ def decode(self, buff, len_, sys=[], prn=[]):
 
                 self.fh_galfnav.write("{:4d}\t{:6.1f}\t{:3d}\t{:1d}\t{:3d}\t".
                                       format(self.week, self.tow,
-                                             prn, src, 32))
+                                             prn, type_, 32))
                 msg = bytearray(32)
                 for i in range(8):
                     d = st.unpack_from('<L', buff, k)[0]
@@ -651,6 +656,13 @@ def decode(self, buff, len_, sys=[], prn=[]):
             crcpass, cnt, src, freq, ch = st.unpack_from('<BBBBB', buff, k)
             k += 5
             if self.flg_galinav:
+                if src & 0x1f == 17:  # E1B
+                    type_ = 0
+                elif src & 0x1f == 21:  # E5b
+                    type_ = 2
+                else:
+                    return -1
+
                 if crcpass != 1:
                     if self.monlevel > 0:
                         print("crc error in GALRawINAV " +
@@ -661,7 +673,7 @@ def decode(self, buff, len_, sys=[], prn=[]):
 
                 self.fh_galinav.write("{:4d}\t{:6.1f}\t{:3d}\t{:1d}\t{:3d}\t".
                                       format(self.week, self.tow, prn,
-                                             src, 32))
+                                             type_, 32))
                 msg = bytearray(32)
                 for i in range(8):
                     d = st.unpack_from('<L', buff, k)[0]
@@ -694,6 +706,11 @@ def decode(self, buff, len_, sys=[], prn=[]):
             crcpass, cnt, src, freq, ch = st.unpack_from('<BBBBB', buff, k)
             k += 5
             if self.flg_gale6:
+                if src & 0x1f == 19:
+                    type_ = 6
+                else:
+                    return -1
+
                 if crcpass != 1:
                     if self.monlevel > 0:
                         print("crc error in GALRawCNAV " +