Changeset 10042 in ntrip for trunk

Timestamp:

May 15, 2023, 10:38:50 AM (19 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppSatObs.cpp (modified) (1 diff)
• combination/bnccomb.cpp (modified) (4 diffs)
• combination/bnccomb.h (modified) (1 diff)

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -33 +33 @@
 using namespace std;
 
-const double   GLO_WEIGHT_FACTOR = 5.0;
+const double   GLO_WEIGHT_FACTOR = 1.0;
 const double   BDS_WEIGHT_FACTOR = 1.0;
 

trunk/BNC/src/combination/bnccomb.cpp

@@ -116 +116 @@
 // Singleton: definition class variable
 ////////////////////////////////////////////////////////////////////////////
-bncComb* bncComb::instance = nullptr; 
+bncComb* bncComb::instance = nullptr;
 
 
@@ -484 +484 @@
     // Check Correction Age
     // --------------------
-    //if (_lastEpoTimeOK.valid() && newClk->_time <= _lastEpoTimeOK) {
-    if (_lastClkCorrTime.valid() && newClk->_time < _lastClkCorrTime) {
+    if (_resTime.valid() && newClk->_time <= _resTime) {
       emit newMessage("bncComb: old correction: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
-                       //QString(" %1 ").arg(_lastEpoTimeOK.timestr().c_str()).toLatin1() + "vs. old" +
-                       QString(" %1 ").arg(_lastClkCorrTime.timestr().c_str()).toLatin1() + "vs. old" +
-                       QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1(), true);
+          QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1() + "vs. last processing Epoch" +
+          QString(" %1 ").arg(_resTime.timestr().c_str()).toLatin1(), true);
       delete newClk;
       continue;
@@ -534 +532 @@
   while (_epoClkData.size()) {
 
-    if(!_lastClkCorrTime.valid()) {
+    if (!_lastClkCorrTime.valid()) {
       return;
     }
@@ -545 +543 @@
     // -----------------------
     if (epoTime < (_lastClkCorrTime - outWait)) {
-      processEpoch(epoTime, clkCorrVec);
+      _resTime = epoTime;
+      processEpoch(_resTime, clkCorrVec);
       delete _epoClkData.front();
       _epoClkData.pop_front();

trunk/BNC/src/combination/bnccomb.h

@@ -246 +246 @@
   std::deque<epoClkData*>                    _epoClkData;
   bncTime                                    _lastClkCorrTime;
+  bncTime                                    _resTime;
   QMap<char, QVector<cmbParam*>>             _params;
   QMap<char, cmbEpoch>                       _buffer;