Changeset 9398 in ntrip for trunk/BNC

Timestamp:

Apr 1, 2021, 12:02:16 PM (4 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (3 diffs)
• pppFilter.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -823 +823 @@
       }
     }
-
+    // all available satellites were already tried to use
     if ((!refSatDefined) && (refSatReDefinition == failure)) {
       refSat->setPrn(t_prn(sys, 99));
-      continue;
+      _obsPool->setRefSatChangeRequired(sys, false);
+      return;
     }
 
@@ -852 +853 @@
     }
 
-    if (!refSatDefined) { // no observations for that system
+    // no observations for that system
+    // ===============================
+    if (!refSatDefined) {
       refSat->setPrn(t_prn());
     }
-    _obsPool->setRefSatChangeRequired(sys, false);
-  }
+
+    _obsPool->setRefSatChangeRequired(sys, false); // done or impossible
+  }
+
+  return;
 }
 
@@ -876 +882 @@
     }
     else if (prn.number() == 99) { // refSat re-definition not possible
+#ifdef BNC_DEBUG_PPP
+          LOG << " => refSat re-definition impossible: " << sys << endl;
+#endif
       return failure;
     }

trunk/BNC/src/PPP/pppFilter.cpp

@@ -209 +209 @@
     return failure;
   }
-  if (preProcessing && _obsPool->refSatChangeRequired(sys)) { // from detectCycleSlips()
-#ifdef BNC_DEBUG_PPP
-    LOG << "_obsPool->refSatChangeRequired(" << sys << ") from detectCycleSlips()" << endl;
-#endif
+  if (preProcessing && _obsPool->refSatChangeRequired(sys)) {
     return success;
   }