Changeset 9419 in ntrip for trunk/BNC/src/PPP/pppClient.cpp

Timestamp:

May 3, 2021, 2:18:39 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (8 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -73 +73 @@
     }
   }
+
   _offGR = 0.0;
   _offGE = 0.0;
@@ -596 +597 @@
     bool epochReProcessing = false;
     _numEpoProcessing = 0;
+    _historicalRefSats.clear();
+
     do {
       _numEpoProcessing++;
+#ifdef BNC_DEBUG_PPP
+      LOG << "_numEpoProcessing " << _numEpoProcessing  << endl;
+#endif
       if (_obsPool->refSatChanged()) {
         if(_filter->datumTransformation() != success) {
+          LOG << "_filter->datumTransformation() != success" << endl;
           return finish(failure);
         }
         else {
+          LOG << "_filter->datumTransformation() == success" << endl;
           _obsPool->saveLastEpoRefSats();
         }
@@ -631 +639 @@
       if (_opt->_refSatRequired) {
         if (handleRefSatellites(_obsRover) != success) {
-          _historicalRefSats.clear();
           return finish(failure);
         }
         if (_obsPool->refSatChanged() &&
-            _opt->_obsModelType  != t_pppOptions::UncombPPP) {
+            (_opt->_obsModelType == OPT->DCMcodeBias ||
+             _opt->_obsModelType == OPT->DCMphaseBias ||
+             _opt->_pseudoObsIono)) {
+          LOG << "refSatChanged()" << endl;
             epochReProcessing = true;
             continue;
@@ -674 +684 @@
       else {
         epochReProcessing = false;
-        _historicalRefSats.clear();
       }
     } while (epochReProcessing);
@@ -795 +804 @@
         refSatDefined = true;
         obsVector[ii]->setAsReference();
-#ifdef BNC_DEBUG_PPP
-        LOG << "=> unchanged refsatprn: "  <<  satObs->prn().toString() << endl;
-#endif
       }
       // reference satellite has changed
@@ -807 +813 @@
             obsVector[ii]->setAsReference();
             refSat->setPrn(satObs->prn());
-#ifdef BNC_DEBUG_PPP
-          LOG << "=> set refsatprn: "  <<  satObs->prn().toString() << endl;
-#endif
           }
           else if ( _historicalRefSats[sys].contains(satObs->prn())) {
@@ -841 +844 @@
           obsVector[ii]->setAsReference();
           refSat->setPrn(satObs->prn());
-#ifdef BNC_DEBUG_PPP
-          LOG << " => set refsatprn: "  <<  satObs->prn().toString() << endl;
-#endif
           if (OPT->_pseudoObsIono) {
             refSat->setStecValue(satObs->getIonoCodeDelay(t_frequency::G1));
@@ -858 +858 @@
       refSat->setPrn(t_prn());
     }
-
     _obsPool->setRefSatChangeRequired(sys, false); // done or impossible
   }