Changeset 10042 in ntrip
- Timestamp:
- May 15, 2023, 10:38:50 AM (17 months ago)
- Location:
- trunk/BNC/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppSatObs.cpp
r10041 r10042 33 33 using namespace std; 34 34 35 const double GLO_WEIGHT_FACTOR = 5.0;35 const double GLO_WEIGHT_FACTOR = 1.0; 36 36 const double BDS_WEIGHT_FACTOR = 1.0; 37 37 -
trunk/BNC/src/combination/bnccomb.cpp
r10040 r10042 116 116 // Singleton: definition class variable 117 117 //////////////////////////////////////////////////////////////////////////// 118 bncComb* bncComb::instance = nullptr; 118 bncComb* bncComb::instance = nullptr; 119 119 120 120 … … 484 484 // Check Correction Age 485 485 // -------------------- 486 //if (_lastEpoTimeOK.valid() && newClk->_time <= _lastEpoTimeOK) { 487 if (_lastClkCorrTime.valid() && newClk->_time < _lastClkCorrTime) { 486 if (_resTime.valid() && newClk->_time <= _resTime) { 488 487 emit newMessage("bncComb: old correction: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() + 489 //QString(" %1 ").arg(_lastEpoTimeOK.timestr().c_str()).toLatin1() + "vs. old" + 490 QString(" %1 ").arg(_lastClkCorrTime.timestr().c_str()).toLatin1() + "vs. old" + 491 QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1(), true); 488 QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1() + "vs. last processing Epoch" + 489 QString(" %1 ").arg(_resTime.timestr().c_str()).toLatin1(), true); 492 490 delete newClk; 493 491 continue; … … 534 532 while (_epoClkData.size()) { 535 533 536 if (!_lastClkCorrTime.valid()) {534 if (!_lastClkCorrTime.valid()) { 537 535 return; 538 536 } … … 545 543 // ----------------------- 546 544 if (epoTime < (_lastClkCorrTime - outWait)) { 547 processEpoch(epoTime, clkCorrVec); 545 _resTime = epoTime; 546 processEpoch(_resTime, clkCorrVec); 548 547 delete _epoClkData.front(); 549 548 _epoClkData.pop_front(); -
trunk/BNC/src/combination/bnccomb.h
r10040 r10042 246 246 std::deque<epoClkData*> _epoClkData; 247 247 bncTime _lastClkCorrTime; 248 bncTime _resTime; 248 249 QMap<char, QVector<cmbParam*>> _params; 249 250 QMap<char, cmbEpoch> _buffer;
Note:
See TracChangeset
for help on using the changeset viewer.