Changeset 8455 in ntrip for branches/BNC_2.12

Timestamp:

Aug 29, 2018, 10:23:59 AM (6 years ago)

Author:

stuerze

Message:

bug fixed regarding TOT in BDS and SBAS RTCM3 ephemeris message

Location:

branches/BNC_2.12/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (3 diffs)
• ephemeris.cpp (modified) (4 diffs)
• ephemeris.h (modified) (2 diffs)

branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

@@ -1102 +1102 @@
    GLOFreq[sv - 1] = 100 + eph._frequency_number ; /* store frequency for other users (MSM) */
     _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
-    
+
     emit newGlonassEph(eph);
     decoded = true;
@@ -1222 +1222 @@
     GETFLOATSIGN(eph._agf1, 8, 1.0 / (1 << 30) / (1 << 10))
 
-    eph._TOW = 0.9999E9;
+    eph._TOT = 0.9999E9;
     eph._health = 0;
 
@@ -1372 +1372 @@
     GETBITS(eph._SatH1, 1)
 
-    eph._TOW = 0.9999E9;
+    eph._TOT = 0.9999E9;
     emit newBDSEph(eph);
     decoded = true;

branches/BNC_2.12/src/ephemeris.cpp

@@ -341 +341 @@
     E_last = E;
     E = M + _e*sin(E);
-    
+
     if (++nLoop == 100) {
       return failure;
@@ -623 +623 @@
   }
 
+
   int nSteps  = int(fabs(dtPos) / nominalStep) + 1;
   double step = dtPos / nSteps;
@@ -1205 +1206 @@
       if ( readDbl(line, pos[1], fieldLen, _agf0 ) ||
            readDbl(line, pos[2], fieldLen, _agf1 ) ||
-           readDbl(line, pos[3], fieldLen, _TOW  ) ) {
+           readDbl(line, pos[3], fieldLen, _TOT  ) ) {
         _checkState = bad;
         return;
@@ -1318 +1319 @@
     .arg(_agf0, 19, 'e', 12)
     .arg(_agf1, 19, 'e', 12)
-    .arg(_TOW,  19, 'e', 12);
+    .arg(_TOT,  19, 'e', 12);
 
   QString fmt = version < 3.0 ? "   %1%2%3%4\n" : "    %1%2%3%4\n";

branches/BNC_2.12/src/ephemeris.h

@@ -344 +344 @@
   t_ephSBAS() {
     _IODN           = 0;
-    _TOW            = 0.0;
+    _TOT            = 0.0;
     _agf0           = 0.0;
     _agf1           = 0.0;
@@ -371 +371 @@
 
   int    _IODN;
-  double _TOW;            // not used (set to  0.9999e9)
+  double _TOT;            // not used (set to  0.9999e9)
   double _agf0;           // [s]    clock correction
   double _agf1;           // [s/s]  clock correction drift