Changeset 6964 in ntrip for trunk/BNC/src


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/pppMain.cpp

    r6824 r6964  
    124124  _logFile  = settings.value("PPP/logFilePPP").toString();
    125125  _nmeaFile = settings.value("PPP/nmeaFile").toString();
    126   _nmeaPort = settings.value("PPP/nmeaPort").toInt();
    127126  _snxtroFile = settings.value("PPP/snxtroFile").toString();
    128127  _snxtroSampling = settings.value("PPP/snxtroSampl").toInt();
     
    143142    QStringList hlp = iSta.next().split(",");
    144143
    145     if (hlp.size() < 9) {
     144    if (hlp.size() < 10) {
    146145      throw t_except("pppMain: wrong option staTable");
    147146    }
     
    159158    opt->_aprSigTrp    = hlp[7].toDouble();
    160159    opt->_noiseTrp     = hlp[8].toDouble();
     160    opt->_nmeaPort     = hlp[9].toInt();
    161161
    162162    if (_realTime) {
     
    207207      opt->_LCsGalileo.push_back(t_lc::cIF);
    208208      opt->_LCsGalileo.push_back(t_lc::lIF);
     209    }
     210
     211    if      (settings.value("PPP/lcBDS").toString() == "P3") {
     212      opt->_LCsBDS.push_back(t_lc::cIF);
     213    }
     214    else if (settings.value("PPP/lcBDS").toString() == "L3") {
     215      opt->_LCsBDS.push_back(t_lc::lIF);
     216    }
     217    else if (settings.value("PPP/lcBDS").toString() == "P3&L3") {
     218      opt->_LCsBDS.push_back(t_lc::cIF);
     219      opt->_LCsBDS.push_back(t_lc::lIF);
    209220    }
    210221
  • trunk/BNC/src/pppMain.h

    r6749 r6964  
    2424  QString  _snxtroFile;
    2525  int      _snxtroSampling;
    26   int      _nmeaPort;
    2726  bool     _running;
    2827  bool     _realTime;
Note: See TracChangeset for help on using the changeset viewer.