Changeset 5921 in ntrip

Timestamp:

Aug 12, 2014, 6:01:16 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppMain.cpp (modified) (1 diff)
• pppParlist.cpp (modified) (5 diffs)
• pppParlist.h (modified) (1 diff)

trunk/BNC/src/PPP/pppMain.cpp

@@ -237 +237 @@
     opt->_minObs      = 4;
     opt->_minEle      = 10.0 * M_PI / 180.0;
-    opt->_maxResC1    = 10.0;
-    opt->_maxResL1    = 0.10;
-    opt->_eleWgtCode  = false;
+    opt->_maxResC1    = 3.0;
+    opt->_maxResL1    = 0.03;
+    opt->_eleWgtCode  = true;
     opt->_eleWgtPhase = false;
     opt->_aprSigAmb   = 100.0;

trunk/BNC/src/PPP/pppParlist.cpp

@@ -92 +92 @@
      break;
    case amb:
+     _epoSpec = false;
+     _sigma0  = OPT->_aprSigAmb;
      _ambInfo = new t_ambInfo();
      if (obsVector) {
@@ -106 +108 @@
        }
      }
-     _epoSpec = false;
-     _sigma0  = OPT->_aprSigAmb;
+     break;
+   case offGG:
+     _epoSpec = true;
+     _sigma0  = 1000.0;
+     _x0      = PPP_CLIENT->offGG();
      break;
    case trp:
@@ -146 +151 @@
   case clkR:
     return 1.0;
+  case offGG:
+    return (obs->prn().system() == 'R') ? 1.0 : 0.0;
   case amb:
     if (obs->prn() == _prn) {
@@ -192 +199 @@
   case amb:
     ss << "AMB " << left << setw(3) << t_lc::toString(_tLC) << right << ' ' << _prn.toString();
+    break;
+  case offGG:
+    ss << "OGG        ";
     break;
   case trp:
@@ -288 +298 @@
   required.push_back(new t_pppParam(t_pppParam::clkR, t_prn(), t_lc::dummy));
 
+  // GPS-Glonass Clock Offset
+  // ------------------------
+  if (OPT->useGlonass()) {
+    required.push_back(new t_pppParam(t_pppParam::offGG, t_prn(), t_lc::dummy));
+  }
+
   // Troposphere
   // -----------

trunk/BNC/src/PPP/pppParlist.h

@@ -14 +14 @@
 class t_pppParam {
  public:
-  enum e_type {crdX, crdY, crdZ, clkR, amb, trp};
+  enum e_type {crdX, crdY, crdZ, clkR, amb, offGG, trp};
 
   t_pppParam(e_type type, const t_prn& prn, t_lc::type tLC,