Changeset 5157 in ntrip for trunk/BNC/src/bncmodel.cpp

Timestamp:

May 26, 2013, 11:24:09 AM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncmodel.cpp (modified) (6 diffs)

trunk/BNC/src/bncmodel.cpp

@@ -110 +110 @@
   }
 
+  // Glonass Offset
+  // --------------
+  else if (type == GLONASS_OFFSET) {
+    if (satData->prn[0] == 'R') {
+      return 1.0;
+    }
+    else {
+      return 0.0;
+    }
+  }
+
   // Galileo Offset
   // --------------
@@ -228 +239 @@
     _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, ""));
   }
+  if (_opt->useGlonass) {
+    _params.push_back(new bncParam(bncParam::GLONASS_OFFSET, ++nextPar, ""));
+  }
   if (_opt->useGalileo) {
     _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, ""));
@@ -246 +260 @@
       _QQ(iPar,iPar) = _opt->sigTrp0 * _opt->sigTrp0; 
       pp->xx = lastTrp;
+    }
+    else if (pp->type == bncParam::GLONASS_OFFSET) {
+      _QQ(iPar,iPar) = _opt->sigGlonassOffset0 * _opt->sigGlonassOffset0; 
     }
     else if (pp->type == bncParam::GALILEO_OFFSET) {
@@ -334 +351 @@
 
   double offset = 0.0;
-  if (satData->prn[0] == 'E') {
+  if      (satData->prn[0] == 'R') {
+    offset = Glonass_offset();
+  }
+  else if (satData->prn[0] == 'E') {
     offset = Galileo_offset();
   }
@@ -483 +503 @@
       }
     
+      // Glonass Offset
+      // --------------
+      else if (pp->type == bncParam::GLONASS_OFFSET) {
+        _QQ(iPar,iPar) += _opt->sigGlonassOffsetP * _opt->sigGlonassOffsetP;
+      }
+
       // Galileo Offset
       // --------------
@@ -621 +647 @@
       newPos->xnt[6] = aprTrp + par->xx;
     }
+    else if (par->type == bncParam::GLONASS_OFFSET) {
+      strB << "\n    offGlo  = " << setw(10) << setprecision(3) << par->xx 
+           << " +- " << setw(6) << setprecision(3) 
+           << sqrt(_QQ(par->index,par->index));
+    }
     else if (par->type == bncParam::GALILEO_OFFSET) {
-      strB << "\n    offset  = " << setw(10) << setprecision(3) << par->xx 
+      strB << "\n    offGal  = " << setw(10) << setprecision(3) << par->xx 
            << " +- " << setw(6) << setprecision(3) 
            << sqrt(_QQ(par->index,par->index));