Changeset 9765 in ntrip for trunk/BNC/src/bnccore.cpp

Timestamp:

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

Author:

stuerze

Message:

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

File:

• trunk/BNC/src/bnccore.cpp (modified) (4 diffs)

trunk/BNC/src/bnccore.cpp

@@ -203 +203 @@
 #ifdef BNC_DEBUG_BCEP
   if      (eph->checkState() == t_eph::bad) {
-    messagePrivate(QString("%1: WRONG EPHEMERIS: %2")
+    messagePrivate(QString("%1: WRONG %2:%3")
                    .arg(eph->receptStaID())
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
+                   .arg(eph->navTypeString(eph->navType(), eph->prn(), 99.0))
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
     return failure;
   }
   else if (eph->checkState() == t_eph::outdated) {
-    messagePrivate(QString("%1: OUTDATED EPHEMERIS: %2")
+    messagePrivate(QString("%1: OUTDATED %2:%3")
                    .arg(eph->receptStaID())
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
+                   .arg(eph->navTypeString(eph->navType(), eph->prn(), 99.0))
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
     return failure;
   }
   else if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate(QString("%1: UNHEALTHY EPHEMERIS: %2")
+    messagePrivate(QString("%1: UNHEALTHY %2:%3")
                    .arg(eph->receptStaID())
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
+                   .arg(eph->navTypeString(eph->navType(), eph->prn(), 99.0))
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
   }
 #endif
@@ -383 +386 @@
     if (_rinexVers > 2) {
       if ( ! (appendFlagGPS & QIODevice::Append)) {
+        double rinexVersion = defaultRnxNavVersion4;
+        if (_rinexVers < 4.0) {
+          rinexVersion = defaultRnxNavVersion3;
+        }
         QString line = QString().asprintf("%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
-          defaultRnxNavVersion3, "", "");
+            rinexVersion, "", "");
         *_ephStreamGPS << line;
         line.clear();
@@ -397 +404 @@
         while (it.hasNext()) {
           *_ephStreamGPS << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
+        }
+
+        if (_rinexVers == 4) {
+          int leapSecs = gnumleap(datTim.date().year(), datTim.date().month(), datTim.date().day());
+          *_ephStreamGPS << QString("%1").arg(leapSecs, 6, 10, QLatin1Char(' ')).left(60).leftJustified(60)
+                  << "LEAP SECONDS\n";
         }
 
@@ -471 +484 @@
     printOutputEph(printFile, _ephStreamGPS, strV2, strV3, strV4);
   }
-  else if (_rinexVers == 3) {
+  else if (_rinexVers >= 3) {
     printOutputEph(printFile, _ephStreamGPS, strV2, strV3, strV4);
   }