Changeset 9866 in ntrip for trunk/BNC/src/pppMain.cpp

Timestamp:

Oct 31, 2022, 9:49:58 PM (18 months ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/pppMain.cpp (modified) (3 diffs)

trunk/BNC/src/pppMain.cpp

@@ -149 +149 @@
     t_pppOptions* opt = new t_pppOptions();
 
-    opt->_realTime     = _realTime;
-    opt->_roverName    = hlp[0].toStdString();
-    opt->_aprSigCrd[0] = hlp[1].toDouble()+1e-10;
-    opt->_aprSigCrd[1] = hlp[2].toDouble()+1e-10;
-    opt->_aprSigCrd[2] = hlp[3].toDouble()+1e-10;
-    opt->_noiseCrd[0]  = hlp[4].toDouble()+1e-10;
-    opt->_noiseCrd[1]  = hlp[5].toDouble()+1e-10;
-    opt->_noiseCrd[2]  = hlp[6].toDouble()+1e-10;
-    opt->_aprSigTrp    = hlp[7].toDouble();
-    opt->_noiseTrp     = hlp[8].toDouble();
-    opt->_nmeaPort     = hlp[9].toInt();
-
+    opt->_realTime         = _realTime;
+    opt->_roverName        = hlp[0].toStdString();
+    opt->_aprSigCrd[0]     = hlp[1].toDouble()+1e-10;
+    opt->_aprSigCrd[1]     = hlp[2].toDouble()+1e-10;
+    opt->_aprSigCrd[2]     = hlp[3].toDouble()+1e-10;
+    opt->_noiseCrd[0]      = hlp[4].toDouble()+1e-10;
+    opt->_noiseCrd[1]      = hlp[5].toDouble()+1e-10;
+    opt->_noiseCrd[2]      = hlp[6].toDouble()+1e-10;
+    opt->_aprSigTrp        = hlp[7].toDouble();
+    opt->_noiseTrp         = hlp[8].toDouble();
+    opt->_nmeaPort         = hlp[9].toInt();
+#ifdef USE_PPP
+    opt->_signalPriorities = hlp[10].toStdString();
+#endif
     if (_realTime) {
       opt->_corrMount.assign(settings.value("PPP/corrMount").toString().toStdString());
@@ -181 +183 @@
 #endif
     opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0)  opt->_sigmaC1  = 2.00;
-    opt->_sigmaL1      = settings.value("PPP/sigmaL1").toDouble(); if (opt->_sigmaL1 <= 0.0)  opt->_sigmaL1  = 0.01;
+    opt->_sigmaL1      = settings.value("PPP/sigmaL1").toDouble(); if (opt->_sigmaL1 <= 0.0)  opt->_sigmaL1  = 0.02;
     opt->_sigmaGIM     = settings.value("PPP/sigmaGIM").toDouble();if (opt->_sigmaGIM <= 0.0) opt->_sigmaGIM = 5.00;
     opt->_corrWaitTime = settings.value("PPP/corrWaitTime").toDouble();
@@ -412 +414 @@
     opt->_minObs      = settings.value("PPP/minObs").toInt(); if (opt->_minObs < 4) opt->_minObs = 4;
     opt->_minEle      = settings.value("PPP/minEle").toDouble() * M_PI / 180.0;
-    opt->_maxResC1    = settings.value("PPP/maxResC1").toDouble(); if (opt->_maxResC1 <= 0.0) opt->_maxResC1 = 4.0;
-    opt->_maxResL1    = settings.value("PPP/maxResL1").toDouble(); if (opt->_maxResL1 <= 0.0) opt->_maxResL1 = 0.03;
-    opt->_maxResGIM   = settings.value("PPP/maxResGIM").toDouble(); if (opt->_maxResGIM <= 0.0) opt->_maxResGIM = 6.0;
+    opt->_maxResC1    = settings.value("PPP/maxResC1").toDouble(); if (opt->_maxResC1 <= 0.0) opt->_maxResC1 = 2.0;
+    opt->_maxResL1    = settings.value("PPP/maxResL1").toDouble(); if (opt->_maxResL1 <= 0.0) opt->_maxResL1 = 0.02;
+    opt->_maxResGIM   = settings.value("PPP/maxResGIM").toDouble(); if (opt->_maxResGIM <= 0.0) opt->_maxResGIM = 5.0;
     opt->_eleWgtCode  = (settings.value("PPP/eleWgtCode").toInt() != 0);
     opt->_eleWgtPhase = (settings.value("PPP/eleWgtPhase").toInt() != 0);