Changeset 9216 in ntrip for branches/BNC_2.12

Timestamp:

Nov 4, 2020, 4:02:19 PM (3 years ago)

Author:

stuerze

Message:

ephemeris checks + debugging output added

Location:

branches/BNC_2.12/src

Files:

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

branches/BNC_2.12/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)
     eph._prn.set('R', sv);
@@ -1224 +1226 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 4)
     eph._prn.set('J', i);
@@ -1306 +1309 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('I', i);
@@ -1396 +1400 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('S', 20 + i);
@@ -1450 +1455 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     eph._inav = (i == 1046);
     eph._fnav = (i == 1045);
@@ -1555 +1561 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('C', i);

branches/BNC_2.12/src/bnccore.cpp

@@ -202 +202 @@
   t_irc ircPut = _ephUser.putNewEph(eph, true);
   if      (eph->checkState() == t_eph::bad) {
-    messagePrivate("WRONG EPHEMERIS\n" + eph->toString(3.0).toAscii());
+    messagePrivate(QString("WRONG EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
     return failure;
   }
   else if (eph->checkState() == t_eph::outdated) {
-    messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toAscii());
+    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)).toAscii());
     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)).toAscii());
   }
   printEphHeader();

branches/BNC_2.12/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);
@@ -187 +190 @@
     _M_tau_GPS        = 0.0;
     _M_l5             = 0.0;
+    _receptStaID      = "";    
   }
   t_ephGlo(float rnxVersion, const QStringList& lines);
@@ -279 +283 @@
     _BGD_1_5B        = 0.0;
     _TOT             = 0.0;
+    _receptStaID     = "";    
   };
   t_ephGal(float rnxVersion, const QStringList& lines);
@@ -359 +364 @@
     _ura            = 0.0;
     _health         = 0.0;
+    _receptStaID    = "";    
   }
   t_ephSBAS(float rnxVersion, const QStringList& lines);
@@ -426 +432 @@
    _TOEsec          = 0.0;
    _TOEweek         =-1.0;
+    _receptStaID    = "";   
  }
  t_ephBDS(float rnxVersion, const QStringList& lines);

branches/BNC_2.12/src/src.pri

@@ -27 +27 @@
 debug:DEFINES  += BNC_DEBUG_BCEP
 #debug:DEFINES  += BNC_DEBUG_SSR
+release:DEFINES += BNC_DEBUG_BCEP
 
 # Include Path