Changeset 8455 in ntrip for branches/BNC_2.12


Ignore:
Timestamp:
Aug 29, 2018, 10:23:59 AM (6 years ago)
Author:
stuerze
Message:

bug fixed regarding TOT in BDS and SBAS RTCM3 ephemeris message

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

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

    r8200 r8455  
    11021102   GLOFreq[sv - 1] = 100 + eph._frequency_number ; /* store frequency for other users (MSM) */
    11031103    _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
    1104    
     1104
    11051105    emit newGlonassEph(eph);
    11061106    decoded = true;
     
    12221222    GETFLOATSIGN(eph._agf1, 8, 1.0 / (1 << 30) / (1 << 10))
    12231223
    1224     eph._TOW = 0.9999E9;
     1224    eph._TOT = 0.9999E9;
    12251225    eph._health = 0;
    12261226
     
    13721372    GETBITS(eph._SatH1, 1)
    13731373
    1374     eph._TOW = 0.9999E9;
     1374    eph._TOT = 0.9999E9;
    13751375    emit newBDSEph(eph);
    13761376    decoded = true;
  • branches/BNC_2.12/src/ephemeris.cpp

    r8420 r8455  
    341341    E_last = E;
    342342    E = M + _e*sin(E);
    343    
     343
    344344    if (++nLoop == 100) {
    345345      return failure;
     
    623623  }
    624624
     625
    625626  int nSteps  = int(fabs(dtPos) / nominalStep) + 1;
    626627  double step = dtPos / nSteps;
     
    12051206      if ( readDbl(line, pos[1], fieldLen, _agf0 ) ||
    12061207           readDbl(line, pos[2], fieldLen, _agf1 ) ||
    1207            readDbl(line, pos[3], fieldLen, _TOW  ) ) {
     1208           readDbl(line, pos[3], fieldLen, _TOT  ) ) {
    12081209        _checkState = bad;
    12091210        return;
     
    13181319    .arg(_agf0, 19, 'e', 12)
    13191320    .arg(_agf1, 19, 'e', 12)
    1320     .arg(_TOW,  19, 'e', 12);
     1321    .arg(_TOT,  19, 'e', 12);
    13211322
    13221323  QString fmt = version < 3.0 ? "   %1%2%3%4\n" : "    %1%2%3%4\n";
  • branches/BNC_2.12/src/ephemeris.h

    r8216 r8455  
    344344  t_ephSBAS() {
    345345    _IODN           = 0;
    346     _TOW            = 0.0;
     346    _TOT            = 0.0;
    347347    _agf0           = 0.0;
    348348    _agf1           = 0.0;
     
    371371
    372372  int    _IODN;
    373   double _TOW;            // not used (set to  0.9999e9)
     373  double _TOT;            // not used (set to  0.9999e9)
    374374  double _agf0;           // [s]    clock correction
    375375  double _agf1;           // [s/s]  clock correction drift
Note: See TracChangeset for help on using the changeset viewer.