Changeset 9481 in ntrip for trunk/BNC/src/PPP_SSR_I/pppClient.cpp

Timestamp:

Jul 19, 2021, 10:46:16 PM (3 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/PPP_SSR_I/pppClient.cpp (modified) (4 diffs)

trunk/BNC/src/PPP_SSR_I/pppClient.cpp

@@ -99 +99 @@
     satData->P2       = 0.0;
     satData->P5       = 0.0;
+    satData->P6       = 0.0;
     satData->P7       = 0.0;
     satData->L1       = 0.0;
     satData->L2       = 0.0;
     satData->L5       = 0.0;
+    satData->L6       = 0.0;
     satData->L7       = 0.0;
     for (unsigned ifrq = 0; ifrq < obs->_obs.size(); ifrq++) {
@@ -115 +117 @@
             cb  = bias._value;
           }
+          // FIXME: use C/Q bias for X observations
+          // qDebug() << satData->prn << frqObs->_rnxType2ch.c_str();
         }
       }
@@ -130 +134 @@
         if (frqObs->_codeValid)  satData->P5       = frqObs->_code + cb;
         if (frqObs->_phaseValid) satData->L5       = frqObs->_phase;
+        if (frqObs->_slip)       satData->slipFlag = true;
+      }
+      else if (frqObs->_rnxType2ch[0] == '6') {
+        if (frqObs->_codeValid)  satData->P6       = frqObs->_code + cb;
+        if (frqObs->_phaseValid) satData->L6       = frqObs->_phase;
         if (frqObs->_slip)       satData->slipFlag = true;
       }
@@ -276 +285 @@
   // ---------------------
   else if (satData->system() == 'C' && _opt->useSystem('C')) {
-    if (satData->P2 != 0.0 && satData->P7 != 0.0 &&
-        satData->L2 != 0.0 && satData->L7 != 0.0 ) {
+    if (satData->P2 != 0.0 && satData->P6 != 0.0 &&
+        satData->L2 != 0.0 && satData->L6 != 0.0 ) {
       double f2 = t_CST::freq(t_frequency::C2, 0);
-      double f7 = t_CST::freq(t_frequency::C7, 0);
-      double a2 =   f2 * f2 / (f2 * f2 - f7 * f7);
-      double a7 = - f7 * f7 / (f2 * f2 - f7 * f7);
+      double f6 = t_CST::freq(t_frequency::C6, 0);
+      double a2 =   f2 * f2 / (f2 * f2 - f6 * f6);
+      double a6 = - f6 * f6 / (f2 * f2 - f6 * f6);
       satData->L2      = satData->L2 * t_CST::c / f2;
-      satData->L7      = satData->L7 * t_CST::c / f7;
-      satData->P3      = a2 * satData->P2 + a7 * satData->P7;
-      satData->L3      = a2 * satData->L2 + a7 * satData->L7;
-      satData->lambda3 = a2 * t_CST::c / f2 + a7 * t_CST::c / f7;
+      satData->L6      = satData->L6 * t_CST::c / f6;
+      satData->P3      = a2 * satData->P2 + a6 * satData->P6;
+      satData->L3      = a2 * satData->L2 + a6 * satData->L6;
+      satData->lambda3 = a2 * t_CST::c / f2 + a6 * t_CST::c / f6;
       satData->lkA     = a2;
-      satData->lkB     = a7;
+      satData->lkB     = a6;
       _epoData->satData[satData->prn] = satData;
     }