Changeset 8216 in ntrip for branches/BNC_2.12

Timestamp:

Dec 13, 2017, 1:24:38 PM (6 years ago)

Author:

stuerze

Message:

unhealthy satellites are reported within log file but are remainig in stream and file output

Location:

branches/BNC_2.12/src

Files:

• PPP/pppEphPool.cpp (modified) (1 diff)
• bnccore.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (2 diffs)
• ephemeris.cpp (modified) (1 diff)
• ephemeris.h (modified) (3 diffs)

branches/BNC_2.12/src/PPP/pppEphPool.cpp

@@ -26 +26 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_pppEphPool::putEphemeris(t_eph* eph) {
-  if (eph && eph->checkState() != t_eph::bad) {
+  if (eph && (eph->checkState() != t_eph::bad ||
+              eph->checkState() != t_eph::unhealthy))  {
     _satEphPool[eph->prn().toInt()].putEphemeris(_maxQueueSize, eph);
   }

branches/BNC_2.12/src/bnccore.cpp

@@ -209 +209 @@
     return failure;
   }
+  else if (eph->checkState() == t_eph::unhealthy) {
+    messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+  }
   printEphHeader();
   printEph(*eph, (ircPut == success));

branches/BNC_2.12/src/bncephuser.cpp

@@ -185 +185 @@
     return;
   }
-  
+
   // Check health status
   // -------------------
   if (eph->isUnhealthy()) {
-    eph->setCheckState(t_eph::bad);
-    return;
+    eph->setCheckState(t_eph::unhealthy);
   }
 
@@ -290 +289 @@
       ephL->setCheckState(t_eph::outdated);
       return;
-    }    
+    }
 
     if (diff < MAXDIFF && diffC < MAXDIFF) {

branches/BNC_2.12/src/ephemeris.cpp

@@ -728 +728 @@
 ////////////////////////////////////////////////////////////////////////////
 unsigned int t_ephGlo::isUnhealthy() const {
-  if      (_health == 0 && _almanac_health == 0) {
-    return 1;
-  }
-  else if (_health == 1 && _almanac_health == 0) {
-    return 1;
-  }
-  else if (_health == 1 && _almanac_health == 1) {
-    return 1;
-  }
-
-  return 0;
+
+  switch (_almanac_health_availablility_indicator) {
+    case 1:
+      if ((_health == 0 && _almanac_health == 0) ||
+          (_health == 1 && _almanac_health == 0) ||
+          (_health == 1 && _almanac_health == 1)) {
+        return 1;
+      }
+      break;
+    case 0:
+      if (_health) {
+        return 1;
+      }
+      break;
+  }
+  return 0; /* (_health == 0 && _almanac_health == 1) or (_health == 0) */
 }
 

branches/BNC_2.12/src/ephemeris.h

@@ -18 +18 @@
  public:
   enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, BDS, IRNSS};
-  enum e_checkState {unchecked, ok, bad, outdated};
+  enum e_checkState {unchecked, ok, bad, outdated, unhealthy};
 
   t_eph();
@@ -185 +185 @@
     _M_N4             = 0.0;
     _M_tau_GPS        = 0.0;
-    _M_l5             = 0.0;    
+    _M_l5             = 0.0;
   }
   t_ephGlo(float rnxVersion, const QStringList& lines);
@@ -364 +364 @@
   virtual e_type  type() const {return t_eph::SBAS;}
   virtual unsigned int IOD() const;
-  virtual unsigned int  isUnhealthy() const { return static_cast<unsigned int>(_health); }  
+  virtual unsigned int  isUnhealthy() const { return static_cast<unsigned int>(_health); }
   virtual QString toString(double version) const;