Changeset 7926 in ntrip


Ignore:
Timestamp:
May 30, 2016, 11:28:41 AM (3 years ago)
Author:
stuerze
Message:

some nmea components in PPP output are fixed: time stamp is now UTC, hDop value instead of pDop value

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/pppInclude.h

    r6973 r7926  
    2727class t_output {
    2828 public:
    29   bncTime      _epoTime;           
    30   double       _xyzRover[3]; 
    31   double       _covMatrix[6]; 
    32   double       _neu[3]; 
     29  bncTime      _epoTime;
     30  double       _xyzRover[3];
     31  double       _covMatrix[6];
     32  double       _neu[3];
    3333  double       _trp0;
    3434  double       _trp;
    3535  double       _trpStdev;
    36   int          _numSat;       
    37   double       _pDop;         
    38   std::string  _log;         
    39   bool         _error;       
     36  int          _numSat;
     37  double       _hDop;
     38  std::string  _log;
     39  bool         _error;
    4040};
    4141
     
    9292      else if (sys == 'C') return t_frequency::C7;
    9393      else                 return t_frequency::dummy;
    94     case lIF: case cIF: case MW: case CL: 
     94    case lIF: case cIF: case MW: case CL:
    9595      return t_frequency::dummy;
    9696    case dummy: case maxLc: return t_frequency::dummy;
     
    119119  virtual      ~interface_pppClient() {};
    120120  virtual void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output) = 0;
    121   virtual void putEphemeris(const t_eph* eph) = 0;                 
    122   virtual void putOrbCorrections(const std::vector<t_orbCorr*>& corr) = 0; 
    123   virtual void putClkCorrections(const std::vector<t_clkCorr*>& corr) = 0; 
     121  virtual void putEphemeris(const t_eph* eph) = 0;
     122  virtual void putOrbCorrections(const std::vector<t_orbCorr*>& corr) = 0;
     123  virtual void putClkCorrections(const std::vector<t_clkCorr*>& corr) = 0;
    124124  virtual void putCodeBiases(const std::vector<t_satCodeBias*>& satCodeBias) = 0;
    125 };   
     125};
    126126
    127127} // namespace BNC_PPP
  • trunk/BNC/src/pppRun.cpp

    r7856 r7926  
    224224  delete _snxtroFile;
    225225  while (!_epoData.empty()) {
    226     delete _epoData.front(); 
     226    delete _epoData.front();
    227227    _epoData.pop_front();
    228228  }
     
    599599  double lamDeg = ell[1] * 180 / M_PI;
    600600
     601  unsigned year, month, day;
     602  output._epoTime.civil_date(year, month, day);
     603  double gps_utc = gnumleap(year, month, day);
     604
    601605  char phiCh = 'N';
    602606  if (phiDeg < 0) {
     
    616620    string datestr = output._epoTime.datestr(0); // yyyymmdd
    617621    out << "GPRMC,"
    618         << output._epoTime.timestr(0,0) << ",A,"
     622        << (output._epoTime - gps_utc).timestr(3,0) << ",A,"
    619623        << setw(2) << setfill('0') << int(phiDeg)
    620624        << setw(6) << setprecision(3) << setfill('0')
     
    628632  else if (strType == 'G') {
    629633    out << "GPGGA,"
    630         << output._epoTime.timestr(0,0) << ','
     634        << (output._epoTime - gps_utc).timestr(2,0) << ','
    631635        << setw(2) << setfill('0') << int(phiDeg)
    632636        << setw(10) << setprecision(7) << setfill('0')
     
    636640        << fmod(60*lamDeg,60) << ',' << lamCh
    637641        << ",1," << setw(2) << setfill('0') << output._numSat << ','
    638         << setw(3) << setprecision(1) << output._pDop << ','
     642        << setw(3) << setprecision(1) << output._hDop << ','
    639643        << setprecision(3) << ell[2] << ",M,0.0,M,,";
    640644  }
Note: See TracChangeset for help on using the changeset viewer.