Changeset 10243 in ntrip for trunk

Timestamp:

Nov 6, 2023, 10:12:57 PM (7 months ago)

Author:

stuerze

Message:

revert last changes

Location:

trunk/BNC/src/combination

Files:

• bnccomb.cpp (modified) (3 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/src/combination/bnccomb.cpp

@@ -132 +132 @@
     _cmbSampl = 5;
   }
-
-  _cmbWait  = settings.value("cmbWait").toInt();
-  if (_cmbWait <= 0) {
-    _cmbSampl = 10;
-  }
-
   _useGps = (Qt::CheckState(settings.value("cmbGps").toInt()) == Qt::Checked) ? true : false;
   if (_useGps) {
@@ -457 +451 @@
 void bncComb::slotNewClkCorrections(QList<t_clkCorr> clkCorrections) {
   QMutexLocker locker(&_mutex);
+  const double outWait = 1.0 * _cmbSampl;
   int    currentWeek = 0;
   double currentSec  = 0.0;
@@ -581 +576 @@
     // Process the front epoch
     // -----------------------
-    if (epoTime < (_lastClkCorrTime - _cmbWait)) {
+    if (epoTime < (_lastClkCorrTime - outWait)) {
       _resTime = epoTime;
       processEpoch(_resTime, clkCorrVec);

trunk/BNC/src/combination/bnccomb.h

@@ -256 +256 @@
   e_method                                   _method;
   int                                        _cmbSampl;
-  int                                        _cmbWait;
   int                                        _ms;
   QMap<char, cmbEpoch>                       _buffer;