Changeset 8800 in ntrip for trunk/BNC

Timestamp:

Sep 20, 2019, 2:44:22 PM (5 years ago)

Author:

stuerze

Message:

small bug fixed with respect to GLONASS message frame time, written into RINEX files

File:

• trunk/BNC/src/ephemeris.cpp (modified) (6 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -439 +439 @@
     .arg(_OMEGADOT, 19, 'e', 12);
 
+  if (type() == t_eph::IRNSS) {
+    out << QString(fmt)
+      .arg(_IDOT,    19, 'e', 12)
+      .arg(0.0,      19, 'e', 12)
+      .arg(_TOEweek, 19, 'e', 12)
+      .arg(0.0,      19, 'e', 12);
+  }
+  else {
     out << QString(fmt)
       .arg(_IDOT,    19, 'e', 12)
@@ -444 +452 @@
       .arg(_TOEweek, 19, 'e', 12)
       .arg(_L2PFlag, 19, 'e', 12);
+  }
 
   if (type() == t_eph::IRNSS) {
@@ -464 +473 @@
     tot = 0.0;
   }
-  out << QString(fmt)
+  if (type() == t_eph::IRNSS) {
+    out << QString(fmt)
+      .arg(tot,          19, 'e', 12)
+      .arg(0.0,          19, 'e', 12)
+      .arg("",           19, QChar(' '))
+      .arg("",           19, QChar(' '));
+  }
+  else {
+    out << QString(fmt)
       .arg(tot,          19, 'e', 12)
       .arg(_fitInterval, 19, 'e', 12)
       .arg("",           19, QChar(' '))
       .arg("",           19, QChar(' '));
+  }
 
   return rnxStr;
@@ -530 +548 @@
       _TOC.set(year, month, day, hour, min, sec);
       _TOC  = _TOC + _gps_utc;
-
+      int nd = int((_TOC.gpssec())) / (24.0*60.0*60.0);
       if ( readDbl(line, pos[1], fieldLen, _tau  ) ||
            readDbl(line, pos[2], fieldLen, _gamma) ||
@@ -537 +555 @@
         return;
       }
-
-      _tau = -_tau;
+      _tki -= nd * 86400.0;
+      _tau  = -_tau;
     }
 
@@ -637 +655 @@
 QString t_ephGlo::toString(double version) const {
 
-  QString rnxStr = rinexDateStr(_TOC-_gps_utc, _prn, version);
-
+  QString rnxStr = rinexDateStr(_TOC -_gps_utc, _prn, version);
+  int nd = int((_TOC - _gps_utc).gpssec()) / (24.0*60.0*60.0);
   QTextStream out(&rnxStr);
 
   out << QString("%1%2%3\n")
-    .arg(-_tau,  19, 'e', 12)
-    .arg(_gamma, 19, 'e', 12)
-    .arg(_tki,   19, 'e', 12);
+    .arg(-_tau,           19, 'e', 12)
+    .arg(_gamma,          19, 'e', 12)
+    .arg(_tki+nd*86400.0, 19, 'e', 12);
 
   QString fmt = version < 3.0 ? "   %1%2%3%4\n" : "    %1%2%3%4\n";