Changeset 3438 in ntrip for trunk/BNC/combination

Timestamp:

Sep 22, 2011, 10:15:34 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -30 +30 @@
 #include "bnctides.h"
 
+const int moduloTime = 10;
+
+const double sig0_offAC    = 1000.0;
+const double sigP_offAC    = 1000.0;
+const double sig0_offACSat =  100.0;
+const double sigP_offACSat =    0.0;
+const double sig0_clkSat   =  100.0;
+const double sigP_clkSat   =  100.0;
+
+const int MAXPRN_GPS = 32;
+
 using namespace std;
-
-const int MAXPRN_GPS = 32;
 
 // Constructor
@@ -46 +55 @@
 
   if      (type == offAC) {
-    sig_0 = 1000.0;
-    sig_P = 1000.0;
+    sig_0 = sig0_offAC;
+    sig_P = sigP_offAC;
   }
   else if (type == offACSat) {
-    sig_0 = 100.0;
-    sig_P =   0.0;
+    sig_0 = sig0_offACSat;
+    sig_P = sigP_offACSat;
   }
   else if (type == clkSat) {
-    sig_0 = 100.0;
-    sig_P = 100.0;
+    sig_0 = sig0_clkSat;
+    sig_P = sigP_clkSat;
   }
 }
@@ -233 +242 @@
   // Check Modulo Time
   // -----------------
-  const int moduloTime = 10;
   if (int(newCorr->tt.gpssec()) % moduloTime != 0.0) {
     delete newCorr;
@@ -268 +276 @@
   }
 
-  // Remember Last Correction Time
-  // -----------------------------
-  if (!_lastCorrTime.valid() || _lastCorrTime < newCorr->tt) {
-    _lastCorrTime = newCorr->tt;
-  }
-
   // Process previous Epoch(s)
   // -------------------------
-  const double waitTime = 20.0; // wait 20 seconds
   QListIterator<bncTime> itTime(_buffer.keys());
   while (itTime.hasNext()) {
     bncTime epoTime = itTime.next();
-    if (epoTime < _lastCorrTime - waitTime) {
+    if (epoTime < newCorr->tt - moduloTime) {
       _resTime = epoTime;
       processEpoch();

trunk/BNC/combination/bnccomb.h

@@ -79 +79 @@
 
   QList<cmbAC*>           _ACs;
-  bncTime                 _lastCorrTime;
   bncTime                 _resTime;
   QVector<cmbParam*>      _params;