Changeset 6035 in ntrip for trunk

Timestamp:

Aug 21, 2014, 1:04:43 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (2 diffs)
• pppOptions.cpp (modified) (1 diff)
• pppOptions.h (modified) (1 diff)
• pppParlist.cpp (modified) (1 diff)
• pppSatObs.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -157 +157 @@
   // Create vector of valid observations
   // -----------------------------------
-  int numValidGPS = 0;
   for (unsigned ii = 0; ii < satObs.size(); ii++) {
     char system = satObs[ii]->_prn.system();
-    if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
+    if (OPT->useSystem(system)) {
       t_pppSatObs* pppSatObs = new t_pppSatObs(*satObs[ii]);
       if (pppSatObs->isValid()) {
         obsVector.push_back(pppSatObs);
-        if (pppSatObs->prn().system() == 'G') {
-          ++numValidGPS;
-        }
       }
       else {
@@ -283 +279 @@
   double     offGG = 0.0;
 
-  if (OPT->useGlonass()) {
+  if (OPT->useSystem('R')) {
 
     while (obsVector.size() > 0) {

trunk/BNC/src/PPP/pppOptions.cpp

@@ -90 +90 @@
   if (_LCsGPS.size()     > 0) answ.push_back('G');
   if (_LCsGLONASS.size() > 0) answ.push_back('R');
+  if (_LCsGalileo.size() > 0) answ.push_back('E');
   return answ;
 }

trunk/BNC/src/PPP/pppOptions.h

@@ -14 +14 @@
   ~t_pppOptions();
 
+  std::vector<char>              systems() const;
   const std::vector<t_lc::type>& LCs(char system) const;
+  std::vector<t_lc::type>        ambLCs(char system) const;
+  bool useSystem(char system) const {return LCs(system).size() > 0;}
   bool useOrbClkCorr() const;
-  std::vector<char> systems() const;
-  std::vector<t_lc::type> ambLCs(char system) const;
-  bool useGlonass() const  {return _LCsGLONASS.size() > 0;}
   bool estTrp() const {return _aprSigTrp > 0.0 || _noiseTrp > 0.0;}
   bool xyzAprRoverSet() const {

trunk/BNC/src/PPP/pppParlist.cpp

@@ -301 +301 @@
   // GPS-Glonass Clock Offset
   // ------------------------
-  if (OPT->useGlonass()) {
+  if (OPT->useSystem('R')) {
     required.push_back(new t_pppParam(t_pppParam::offGG, t_prn(), t_lc::dummy));
   }

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -85 +85 @@
   // Select pseudoranges and phase observations
   // ------------------------------------------
-  const string preferredAttrib = "CWP_";
+  const string preferredAttrib = "CWPX_";
 
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
@@ -105 +105 @@
   // --------------------
   _fType1 = t_lc::toFreq(_prn.system(),t_lc::l1);
-  _fType2 = t_lc::toFreq(_prn.system(),t_lc::l2);
+  if (_prn.system() == 'E') {
+    _fType2 = t_frequency::E5;
+  }
+  else {
+    _fType2 = t_lc::toFreq(_prn.system(),t_lc::l2);
+  }
 
   // Check whether all required frequencies available