Changeset 9212 in ntrip for trunk

Timestamp:

Nov 4, 2020, 3:28:55 PM (3 years ago)

Author:

stuerze

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (9 diffs)
• bnccore.cpp (modified) (1 diff)
• ephemeris.h (modified) (7 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1023 +1023 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1100 +1101 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(sv, 6)
@@ -1224 +1226 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 4)
@@ -1306 +1309 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1396 +1400 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1450 +1455 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     eph._inav = (i == 1046);
@@ -1555 +1561 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1729 +1736 @@
        * else. */
       if ((id >= 1057 && id <= 1068) ||
-          (id >= 1240 && id <= 1270) ||
-                  (id == 4076)) {
+          (id >= 1240 && id <= 1270) ||
+          (id == 4076)) {
         if (!_coDecoders.contains(_staID.toLatin1())) {
           _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
@@ -1741 +1748 @@
           coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
         }
-        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
-            errmsg) == success) {
+        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize, errmsg) == success) {
           decoded = true;
         }

trunk/BNC/src/bnccore.cpp

@@ -206 +206 @@
   }
   else if (eph->checkState() == t_eph::outdated) {
-    messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+    messagePrivate(QString("OUTDATED EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
     return failure;
   }
   else if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+    messagePrivate(QString("UNHEALTHY EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
   }
   printEphHeader();

trunk/BNC/src/ephemeris.h

@@ -37 +37 @@
   void    setClkCorr(const t_clkCorr* clkCorr);
   const QDateTime& receptDateTime() const {return _receptDateTime;}
+  const QString receptStaID() const {return _receptStaID;}
   static QString rinexDateStr(const bncTime& tt, const t_prn& prn, double version);
   static QString rinexDateStr(const bncTime& tt, const QString& prnStr, double version);
@@ -47 +48 @@
   bncTime      _TOC;
   QDateTime    _receptDateTime;
+  QString      _receptStaID;
   e_checkState _checkState;
   t_orbCorr*   _orbCorr;
@@ -87 +89 @@
     _TOT              = 0.0;
     _fitInterval      = 0.0;
+    _receptStaID      = "";
   }
   t_ephGPS(float rnxVersion, const QStringList& lines);
@@ -186 +189 @@
     _M_tau_GPS        = 0.0;
     _M_l5             = 0.0;
+    _receptStaID      = "";
   }
   t_ephGlo(float rnxVersion, const QStringList& lines);
@@ -278 +282 @@
     _BGD_1_5B        = 0.0;
     _TOT             = 0.0;
+    _receptStaID     = "";
   };
   t_ephGal(float rnxVersion, const QStringList& lines);
@@ -358 +363 @@
     _ura            = 0.0;
     _health         = 0.0;
+    _receptStaID    = "";
   }
   t_ephSBAS(float rnxVersion, const QStringList& lines);
@@ -425 +431 @@
    _TOEsec          = 0.0;
    _TOEweek         =-1.0;
+   _receptStaID     = "";
  }
  t_ephBDS(float rnxVersion, const QStringList& lines);