Changeset 3106 in ntrip

Timestamp:

Mar 21, 2011, 4:50:07 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -217 +217 @@
   }
 
-  unsigned nPar = _params.size();
-
-  _QQ.ReSize(nPar); 
-
-  _QQ = 0.0;
-
-  for (int iPar = 1; iPar <= _params.size(); iPar++) {
-    bncParam* pp = _params[iPar-1];
-    if      (pp->isCrd()) {
-      _QQ(iPar,iPar) = _sigCrd0 * _sigCrd0; 
-    }
-    else if (pp->type == bncParam::RECCLK) {
-      _QQ(iPar,iPar) = _sigClk0 * _sigClk0; 
-    }
-    else if (pp->type == bncParam::TROPO) {
-      _QQ(iPar,iPar) = _sigTrp0 * _sigTrp0; 
-    }
-    else if (pp->type == bncParam::GALILEO_OFFSET) {
-      _QQ(iPar,iPar) = _sigGalileoOffset0 * _sigGalileoOffset0; 
-    }
-  }
-
   // NMEA Output
   // -----------
@@ -448 +426 @@
   bncSettings settings;
 
+  _time = epoData->tt; // current epoch time
+
+  const double MAXSOLGAP = 60.0;
+
   bool firstCrd = false;
-  if (x() == 0.0 && y() == 0.0 && z() == 0.0) {
+  if (!_lastTimeOK.valid() || _time - _lastTimeOK > MAXSOLGAP) {
     firstCrd = true;
     _startTime = epoData->tt;
+
+    unsigned nPar = _params.size();
+    _QQ.ReSize(nPar); 
+    _QQ = 0.0;
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      bncParam* pp = _params[iPar-1];
+      pp->xx = 0.0;
+      if      (pp->isCrd()) {
+        _QQ(iPar,iPar) = _sigCrd0 * _sigCrd0; 
+      }
+      else if (pp->type == bncParam::RECCLK) {
+        _QQ(iPar,iPar) = _sigClk0 * _sigClk0; 
+      }
+      else if (pp->type == bncParam::TROPO) {
+        _QQ(iPar,iPar) = _sigTrp0 * _sigTrp0; 
+      }
+      else if (pp->type == bncParam::GALILEO_OFFSET) {
+        _QQ(iPar,iPar) = _sigGalileoOffset0 * _sigGalileoOffset0; 
+      }
+    }
   }
 
@@ -622 +624 @@
   _log.clear();  
 
-  _time = epoData->tt;
-
   if (settings.value("pppSPP").toString() == "PPP") {
     _log += "Precise Point Positioning of Epoch " 
@@ -976 +976 @@
   writeNMEAstr(QString(strGGA.str().c_str()));
 
+  _lastTimeOK = _time; // remember time of last successful update
   return success;
 }

trunk/BNC/bncmodel.h

@@ -130 +130 @@
 
   bncTime               _time;
+  bncTime               _lastTimeOK;
   QByteArray            _staID;
   QVector<bncParam*>    _params;