Changeset 7931 in ntrip


Ignore:
Timestamp:
May 30, 2016, 12:41:25 PM (3 years ago)
Author:
stuerze
Message:

some nmea components in PPP output are fixed: time stamp is now utc, h Dop value instead of pDop value

Location:
branches/BNC_2.12/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/pppInclude.h

    r6973 r7931  
    3535  double       _trpStdev;
    3636  int          _numSat;       
    37   double       _pDop;         
     37  double       _hDop;         
    3838  std::string  _log;         
    3939  bool         _error;       
  • branches/BNC_2.12/src/pppRun.cpp

    r7856 r7931  
    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.