Changeset 9551 in ntrip for trunk/BNC/src/PPP

Timestamp:

Nov 23, 2021, 2:35:04 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppFilter.h (modified) (1 diff)
• pppParlist.cpp (modified) (1 diff)
• pppSatObs.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -669 +669 @@
       if (_filter->processEpoch() != success) {
         LOG << "filter->processEpoch() != success" << endl;
+        if (_filter->ageOfLastSolutionOK() >= 120) {
+          reset();
+        }
         return finish(failure,7);
       }

trunk/BNC/src/PPP/pppFilter.h

@@ -61 +61 @@
     return 0.0;
   };
+  double ageOfLastSolutionOK() { return (_epoTime - _lastEpoTimeOK);}
 
  private:

trunk/BNC/src/PPP/pppParlist.cpp

@@ -675 +675 @@
         required.push_back(new t_pppParam(t_pppParam::pBiasR2, t_prn(), t_lc::l2));
       }
-
     }
     if (_usedSystems.contains('E')) {

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -305 +305 @@
 
   retVal = sqrt(retVal);
-/*
-  // De-Weight GLONASS
+
+  /* De-Weight GLONASS
   // -----------------
-  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 5.0;
-  }
-
-  // De-Weight BDS
-  // -------------
-  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+  if ((OPT->_obsModelType == OPT->DCMphaseBias && _prn.system() == 'R' ) &&
+      (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)) ) {
     retVal *= 2.0;
   }
@@ -353 +348 @@
 
   retVal = sqrt(retVal);
-/*
-  // De-Weight GLONASS
-  // -----------------
-  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 5.0;
-  }
-
-  // De-Weight BDS
-  // -------------
-  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 2.0;
-  }
-*/
 
   return retVal;