Changeset 6964 in ntrip for trunk/BNC/src

Timestamp:

Jun 25, 2015, 11:11:03 AM (9 years ago)

Author:

stuerze

Message:

NMEA port was moved into a station dependent table; some additions regarding BDS

Location:

trunk/BNC/src

Files:

• pppMain.cpp (modified) (4 diffs)
• pppMain.h (modified) (1 diff)

trunk/BNC/src/pppMain.cpp

@@ -124 +124 @@
   _logFile  = settings.value("PPP/logFilePPP").toString();
   _nmeaFile = settings.value("PPP/nmeaFile").toString();
-  _nmeaPort = settings.value("PPP/nmeaPort").toInt();
   _snxtroFile = settings.value("PPP/snxtroFile").toString();
   _snxtroSampling = settings.value("PPP/snxtroSampl").toInt();
@@ -143 +142 @@
     QStringList hlp = iSta.next().split(",");
 
-    if (hlp.size() < 9) {
+    if (hlp.size() < 10) {
       throw t_except("pppMain: wrong option staTable");
     }
@@ -159 +158 @@
     opt->_aprSigTrp    = hlp[7].toDouble();
     opt->_noiseTrp     = hlp[8].toDouble();
+    opt->_nmeaPort     = hlp[9].toInt();
 
     if (_realTime) {
@@ -207 +207 @@
       opt->_LCsGalileo.push_back(t_lc::cIF);
       opt->_LCsGalileo.push_back(t_lc::lIF);
+    }
+
+    if      (settings.value("PPP/lcBDS").toString() == "P3") {
+      opt->_LCsBDS.push_back(t_lc::cIF);
+    }
+    else if (settings.value("PPP/lcBDS").toString() == "L3") {
+      opt->_LCsBDS.push_back(t_lc::lIF);
+    }
+    else if (settings.value("PPP/lcBDS").toString() == "P3&L3") {
+      opt->_LCsBDS.push_back(t_lc::cIF);
+      opt->_LCsBDS.push_back(t_lc::lIF);
     }
 

trunk/BNC/src/pppMain.h

@@ -24 +24 @@
   QString  _snxtroFile;
   int      _snxtroSampling;
-  int      _nmeaPort;
   bool     _running;
   bool     _realTime;