Changeset 10327 in ntrip for trunk/BNC/src

Timestamp:

Feb 8, 2024, 12:17:36 PM (12 months ago)

Author:

stuerze

Message:

changes regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (1 diff)
• PPP/pppSatObs.cpp (modified) (3 diffs)
• bnchelp.html (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (4 diffs)
• pppMain.cpp (modified) (9 diffs)
• pppWidgets.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -326 +326 @@
                                     const vector<t_pppSatObs*> &obsVector) {
 
-  const double SLIP = 20.0;
+  double SLIP = 20.0;
+  double fac = 1.0;
+  if (_lastEpoTimeOK.valid()) {
+    fac = _epoTime - _lastEpoTimeOK;
+    if (fac > 60.0 || fac < 1.0) {
+      fac = 1.0;
+    }
+  }
+  SLIP *= fac;
   string epoTimeStr = string(_epoTime);
   const vector<t_pppParam*> &params = _parlist->params();

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -111 +111 @@
                 obs->_codeValid  && obs->_code &&
                 obs->_phaseValid && obs->_phase) {
-              _obs[iFreq] = new t_frqObs(*obs); //cout << "================> newObs: " << obs->_rnxType2ch <<endl;
+              _obs[iFreq] = new t_frqObs(*obs); //cout << "================> newObs: " << obs->_rnxType2ch << " obs->_lockTime: " << obs->_lockTime << endl;
             }
           }
@@ -354 +354 @@
   retVal = sqrt(retVal);
 
-  // De-Weight GLO+BDS
-  // -----------------
+  // De-Weight GLO
+  // -------------
   if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
     retVal *= GLO_WEIGHT_FACTOR;
-  }
-  if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
-    retVal *= BDS_WEIGHT_FACTOR;
   }
 
@@ -401 +398 @@
 
 
-  // Enlarge maxRes GLO+BDS
-  /* ----------------------
+  // Enlarge maxRes GLO
+  // ------------------
   if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
     retVal *= GLO_WEIGHT_FACTOR;
   }
-  if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
-    retVal *= BDS_WEIGHT_FACTOR;
-  }*/
 
   return retVal;

trunk/BNC/src/bnchelp.html

@@ -4081 +4081 @@
       <li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>
       <li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>
-      <li>'Li'    means that uncombined phase data of two frequencies shall be used.</li>
       <li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>
       <li>'P1'    means that uncombined code data of one frequency shall be used.</li>
-      <li>'L1'    means that uncombined phase data of one frequency shall be used.</li>
       <li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>
       <li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>

trunk/BNC/src/bncmain.cpp

@@ -248 +248 @@
       "\n"
       "PPP Client Panel 2 keys:\n"
-      "   PPP/lcGPS        {Select the kind of linear combination from GPS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
-      "   PPP/lcGLONASS    {Select the kind of linear combination from GLONASS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
-      "   PPP/lcGalileo    {Select the kind of linear combination from Galileo code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
-      "   PPP/lcBDS        {Select the kind of linear combination from BDS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
+      "   PPP/lcGPS        {Select the kind of linear combination from GPS code and/or phase data [character string:     Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
+      "   PPP/lcGLONASS    {Select the kind of linear combination from GLONASS code and/or phase data [character string: Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
+      "   PPP/lcGalileo    {Select the kind of linear combination from Galileo code and/or phase data [character string: Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
+      "   PPP/lcBDS        {Select the kind of linear combination from BDS code and/or phase data [character string:     Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
       "   PPP/sigmaC1      {Sigma for code observations in meters [floating-point number]}\n"
       "   PPP/sigmaL1      {Sigma for phase observations in meters [floating-point number]}\n"

trunk/BNC/src/bncwindow.cpp

@@ -1513 +1513 @@
       "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
       "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
-      "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
       "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
       "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
-      "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
       "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
       "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
@@ -1530 +1528 @@
       "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
       "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
-      "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
       "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
       "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
-      "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
       "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
       "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
@@ -1547 +1543 @@
       "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
       "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
-      "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
       "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
       "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
-      "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
       "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
       "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
@@ -1564 +1558 @@
       "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
       "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
-      "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
       "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
       "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
-      "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
       "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
       "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"

trunk/BNC/src/pppMain.cpp

@@ -262 +262 @@
       }
     }
-    if (settings.value("PPP/lcGPS").toString() == "Li") {
-      opt->_LCsGPS.push_back(t_lc::l1);
-      opt->_LCsGPS.push_back(t_lc::l2);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGPS.push_back(t_lc::GIM);
-      }
-    }
     if (settings.value("PPP/lcGPS").toString() == "P1&L1") {
       opt->_LCsGPS.push_back(t_lc::c1);
@@ -281 +274 @@
           opt->_LCsGPS.push_back(t_lc::GIM);
         }
-    }
-    if (settings.value("PPP/lcGPS").toString() == "L1") {
-      opt->_LCsGPS.push_back(t_lc::l1);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGPS.push_back(t_lc::GIM);
-      }
     }
     if (settings.value("PPP/lcGPS").toString() == "P3&L3") {
@@ -315 +302 @@
       }
     }
-    if (settings.value("PPP/lcGLONASS").toString() == "Li") {
-      opt->_LCsGLONASS.push_back(t_lc::l1);
-      opt->_LCsGLONASS.push_back(t_lc::l2);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGLONASS.push_back(t_lc::GIM);
-      }
-    }
     if (settings.value("PPP/lcGLONASS").toString() == "P1&L1") {
       opt->_LCsGLONASS.push_back(t_lc::c1);
@@ -334 +314 @@
           opt->_LCsGLONASS.push_back(t_lc::GIM);
         }
-    }
-    if (settings.value("PPP/lcGLONASS").toString() == "L1") {
-      opt->_LCsGLONASS.push_back(t_lc::l1);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGLONASS.push_back(t_lc::GIM);
-      }
     }
     if (settings.value("PPP/lcGLONASS").toString() == "P3&L3") {
@@ -368 +342 @@
       }
     }
-    if (settings.value("PPP/lcGalileo").toString() == "Li") {
-      opt->_LCsGalileo.push_back(t_lc::l1);
-      opt->_LCsGalileo.push_back(t_lc::l2);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGalileo.push_back(t_lc::GIM);
-      }
-    }
     if (settings.value("PPP/lcGalileo").toString() == "P1&L1") {
       opt->_LCsGalileo.push_back(t_lc::c1);
@@ -387 +354 @@
           opt->_LCsGalileo.push_back(t_lc::GIM);
         }
-    }
-    if (settings.value("PPP/lcGalileo").toString() == "L1") {
-      opt->_LCsGalileo.push_back(t_lc::l1);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsGalileo.push_back(t_lc::GIM);
-      }
     }
     if (settings.value("PPP/lcGalileo").toString() == "P3&L3") {
@@ -421 +382 @@
       }
     }
-    if (settings.value("PPP/lcBDS").toString() == "Li") {
-      opt->_LCsBDS.push_back(t_lc::l1);
-      opt->_LCsBDS.push_back(t_lc::l2);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsBDS.push_back(t_lc::GIM);
-      }
-    }
     if (settings.value("PPP/lcBDS").toString() == "P1&L1") {
       opt->_LCsBDS.push_back(t_lc::c1);
@@ -440 +394 @@
           opt->_LCsBDS.push_back(t_lc::GIM);
         }
-    }
-    if (settings.value("PPP/lcBDS").toString() == "L1") {
-      opt->_LCsBDS.push_back(t_lc::l1);
-      if (opt->_pseudoObsIono) {
-        opt->_LCsBDS.push_back(t_lc::GIM);
-      }
     }
     if (settings.value("PPP/lcBDS").toString() == "P3&L3") {
@@ -529 +477 @@
     opt->_aprSigClkOff    = 300000.0;
     opt->_aprSigAmb       = 10000.0;
-    opt->_aprSigIon       = 1.0e8;
-    opt->_noiseIon        = 1.0e8;
+    opt->_aprSigIon       = 1.0e3;
+    opt->_noiseIon        = 1.0e3;
     opt->_aprSigCodeBias  = 10000.0;
     opt->_noiseCodeBias   = 10000.0;

trunk/BNC/src/pppWidgets.cpp

@@ -128 +128 @@
   _lcGPS->addItems(QString("P3,P3&L3").split(","));
 #else
-  _lcGPS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
+  _lcGPS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
 #endif
 
@@ -134 +134 @@
 #ifdef USE_PPP_SSR_I
    _lcGLONASS->addItems(QString("no,P3,L3,P3&L3").split(","));
-#else  
-  _lcGLONASS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
+#else
+  _lcGLONASS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
 #endif
 
@@ -141 +141 @@
 #ifdef USE_PPP_SSR_I
   _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
-#else  
-  _lcGalileo->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
+#else
+  _lcGalileo->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
 #endif
 
@@ -148 +148 @@
  #ifdef USE_PPP_SSR_I
   _lcBDS->addItems(QString("no,P3,L3,P3&L3").split(","));
-#else 
-  _lcBDS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
+#else
+  _lcBDS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
 #endif