Changeset 9765 in ntrip for trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

Timestamp:

Jun 20, 2022, 4:54:59 PM (22 months ago)

Author:

stuerze

Message:

some more changes to consider RINEX Version 4 nav file (EPH key only)

File:

• trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (modified) (9 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1091 +1091 @@
     eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
+    eph._navType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1216 +1217 @@
     _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
 
+    eph._navType = t_eph::FDMA;
+
     emit newGlonassEph(eph);
     decoded = true;
@@ -1299 +1302 @@
     eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
+    eph._navType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1390 +1394 @@
     SKIPBITS(2)
     eph._TOT = 0.9999e9;
+    eph._navType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1445 +1450 @@
     eph._TOT = 0.9999E9;
     eph._health = 0;
+    eph._navType = t_eph::SBASL1;
 
     emit newSBASEph(eph);
@@ -1529 +1535 @@
         return false;
       }
+      eph._navType = t_eph::INAF;
     }
     else {
@@ -1540 +1547 @@
       GETBITS(eph._E5aHS, 2)
       GETBITS(eph._e5aDataInValid, 1)
+      eph._navType = t_eph::FNAV;
     }
     eph._TOT = 0.9999e9;
@@ -1562 +1570 @@
 bool RTCM3Decoder::DecodeBDSEphemeris(unsigned char* data, int size) {
   bool decoded = false;
+  const double iMaxGEO = 10.0 / 180.0 * M_PI;
 
   if (size == 70) {
@@ -1622 +1631 @@
 
     eph._TOT = 0.9999E9;
+    if (eph._i0 > iMaxGEO) {
+      eph._navType = t_eph::D1;
+    }
+    else {
+      eph._navType = t_eph::D2;
+    }
+
+
     emit newBDSEph(eph);
     decoded = true;