Changeset 3438 in ntrip for trunk/BNC/combination


Ignore:
Timestamp:
Sep 22, 2011, 10:15:34 AM (13 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/combination
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/combination/bnccomb.cpp

    r3437 r3438  
    3030#include "bnctides.h"
    3131
     32const int moduloTime = 10;
     33
     34const double sig0_offAC    = 1000.0;
     35const double sigP_offAC    = 1000.0;
     36const double sig0_offACSat =  100.0;
     37const double sigP_offACSat =    0.0;
     38const double sig0_clkSat   =  100.0;
     39const double sigP_clkSat   =  100.0;
     40
     41const int MAXPRN_GPS = 32;
     42
    3243using namespace std;
    33 
    34 const int MAXPRN_GPS = 32;
    3544
    3645// Constructor
     
    4655
    4756  if      (type == offAC) {
    48     sig_0 = 1000.0;
    49     sig_P = 1000.0;
     57    sig_0 = sig0_offAC;
     58    sig_P = sigP_offAC;
    5059  }
    5160  else if (type == offACSat) {
    52     sig_0 = 100.0;
    53     sig_P =   0.0;
     61    sig_0 = sig0_offACSat;
     62    sig_P = sigP_offACSat;
    5463  }
    5564  else if (type == clkSat) {
    56     sig_0 = 100.0;
    57     sig_P = 100.0;
     65    sig_0 = sig0_clkSat;
     66    sig_P = sigP_clkSat;
    5867  }
    5968}
     
    233242  // Check Modulo Time
    234243  // -----------------
    235   const int moduloTime = 10;
    236244  if (int(newCorr->tt.gpssec()) % moduloTime != 0.0) {
    237245    delete newCorr;
     
    268276  }
    269277
    270   // Remember Last Correction Time
    271   // -----------------------------
    272   if (!_lastCorrTime.valid() || _lastCorrTime < newCorr->tt) {
    273     _lastCorrTime = newCorr->tt;
    274   }
    275 
    276278  // Process previous Epoch(s)
    277279  // -------------------------
    278   const double waitTime = 20.0; // wait 20 seconds
    279280  QListIterator<bncTime> itTime(_buffer.keys());
    280281  while (itTime.hasNext()) {
    281282    bncTime epoTime = itTime.next();
    282     if (epoTime < _lastCorrTime - waitTime) {
     283    if (epoTime < newCorr->tt - moduloTime) {
    283284      _resTime = epoTime;
    284285      processEpoch();
  • trunk/BNC/combination/bnccomb.h

    r3436 r3438  
    7979
    8080  QList<cmbAC*>           _ACs;
    81   bncTime                 _lastCorrTime;
    8281  bncTime                 _resTime;
    8382  QVector<cmbParam*>      _params;
Note: See TracChangeset for help on using the changeset viewer.