Changeset 8852 in ntrip


Ignore:
Timestamp:
Nov 20, 2019, 2:38:50 PM (3 months ago)
Author:
stuerze
Message:

small improvement with respect to fit interval for GPS and QZSS at least if the flag is 0

Location:
trunk/BNC/src/RTCM3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r8844 r8852  
    10211021    int i, week;
    10221022    uint64_t numbits = 0, bitfield = 0;
     1023    int fitIntervalFalg = 0;
    10231024
    10241025    data += 3; /* header */
     
    10711072    GETBITS(eph._health, 6)
    10721073    GETBITS(eph._L2PFlag, 1)
    1073     GETBITS(eph._fitInterval, 1)
     1074    GETBITS(fitIntervalFalg, 1)
     1075    if (fitIntervalFalg == 0) {
     1076      eph._fitInterval = 4.0;
     1077    }
    10741078    eph._TOT = 0.9999e9;
    10751079
     
    11771181    int i, week;
    11781182    uint64_t numbits = 0, bitfield = 0;
     1183    int fitIntervalFalg = 0;
    11791184
    11801185    data += 3; /* header */
     
    12321237    GETFLOATSIGN(eph._TGD,       8, 1.0 / (double )(1 << 30) / (double )(1 << 1))
    12331238    GETBITS(eph._IODC, 10)
    1234     GETBITS(eph._fitInterval, 1)
     1239    GETBITS(fitIntervalFalg, 1)
     1240    if (fitIntervalFalg == 0) {
     1241      eph._fitInterval = 2.0;
     1242    }
    12351243    eph._TOT = 0.9999e9;
    12361244
  • trunk/BNC/src/RTCM3/ephEncoder.cpp

    r8813 r8852  
    1515  unsigned long long bitbuffer = 0;
    1616  int ura = indexFromAccuracy(eph._ura, eph.type());
    17   int L5Flag, SFlag;
     17  int L5Flag, SFlag,  fitIntervalFlag;
    1818
    1919  if (eph.type() == t_eph::QZSS) {
     
    4646    GPSADDBITS(6, eph._health)
    4747    GPSADDBITSFLOAT(8, eph._TGD, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
    48     GPSADDBITS(10, eph._IODC)
    49     GPSADDBITS(1, eph._fitInterval)
     48    (eph._fitInterval == 2.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
     49    GPSADDBITS(1, fitIntervalFlag)
    5050    GPSADDBITS(3, 0) /* padding */
    5151  } else if (eph.type() == t_eph::IRNSS) {
     
    125125    GPSADDBITS(6, eph._health)
    126126    GPSADDBITS(1, eph._L2PFlag)
    127     GPSADDBITS(1, eph._fitInterval)
     127    (eph._fitInterval == 4.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
     128    GPSADDBITS(1, fitIntervalFlag)
    128129  }
    129130
Note: See TracChangeset for help on using the changeset viewer.