Changeset 5157 in ntrip for trunk/BNC/src

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncmodel.cpp (modified) (6 diffs)
• bncmodel.h (modified) (2 diffs)
• pppopt.cpp (modified) (1 diff)
• pppopt.h (modified) (1 diff)

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));

trunk/BNC/src/bncmodel.h

@@ -41 +41 @@
 class bncParam {
  public:
-  enum parType {CRD_X, CRD_Y, CRD_Z, RECCLK, TROPO, AMB_L3, GALILEO_OFFSET};
+  enum parType {CRD_X, CRD_Y, CRD_Z, RECCLK, TROPO, AMB_L3, 
+                GLONASS_OFFSET, GALILEO_OFFSET};
   bncParam(parType typeIn, int indexIn, const QString& prn);
   ~bncParam();
@@ -70 +71 @@
       bncParam* pp = _params[ii];
       if (pp->type == bncParam::TROPO) {
+        return pp->xx;
+      }
+    }
+    return 0.0;
+  }
+  double Glonass_offset() const {
+    for (int ii = 0; ii < _params.size(); ++ii) {
+      bncParam* pp = _params[ii];
+      if (pp->type == bncParam::GLONASS_OFFSET) {
         return pp->xx;
       }

trunk/BNC/src/pppopt.cpp

@@ -107 +107 @@
   if (!pppMode)     corrSync   = 0.0;
 
+  sigGlonassOffset0 = 1000.0;
+  sigGlonassOffsetP =    0.0;
   sigGalileoOffset0 = 1000.0;
   sigGalileoOffsetP =    0.0;

trunk/BNC/src/pppopt.h

@@ -63 +63 @@
   bool    useGlonass;
   bool    useGalileo;
+  double  sigGlonassOffset0;
+  double  sigGlonassOffsetP;
   double  sigGalileoOffset0;
   double  sigGalileoOffsetP;