Changeset 8854 in ntrip


Ignore:
Timestamp:
Nov 20, 2019, 2:52:17 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:
branches/BNC_2.12/src/RTCM3
Files:
2 edited

Legend:

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

    r8843 r8854  
    10291029    int i, week;
    10301030    uint64_t numbits = 0, bitfield = 0;
     1031    int fitIntervalFalg = 0;
    10311032
    10321033    data += 3; /* header */
     
    10801081    GETBITS(eph._health, 6)
    10811082    GETBITS(eph._L2PFlag, 1)
    1082     GETBITS(eph._fitInterval, 1)
     1083    GETBITS(fitIntervalFalg, 1)
     1084    if (fitIntervalFalg == 0) {
     1085      eph._fitInterval = 4.0;
     1086    }
    10831087    eph._TOT = 0.9999e9;
    10841088
     
    11851189    int i, week;
    11861190    uint64_t numbits = 0, bitfield = 0;
    1187 
     1191    int fitIntervalFalg = 0;
     1192   
    11881193    data += 3; /* header */
    11891194    size -= 6; /* header + crc */
     
    12411246    GETFLOATSIGN(eph._TGD, 8, 1.0 / (double )(1 << 30) / (double )(1 << 1))
    12421247    GETBITS(eph._IODC, 10)
    1243     GETBITS(eph._fitInterval, 1)
     1248    GETBITS(fitIntervalFalg, 1)
     1249    if (fitIntervalFalg == 0) {
     1250      eph._fitInterval = 2.0;
     1251    }
    12441252    eph._TOT = 0.9999e9;
    12451253
  • branches/BNC_2.12/src/RTCM3/ephEncoder.cpp

    r8814 r8854  
    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) {
     
    4747    GPSADDBITSFLOAT(8, eph._TGD, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
    4848    GPSADDBITS(10, eph._IODC)
    49     GPSADDBITS(1, eph._fitInterval)
     49    (eph._fitInterval == 2.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
     50    GPSADDBITS(1, fitIntervalFlag)
    5051    GPSADDBITS(3, 0) /* padding */
    5152 } else if (eph.type() == t_eph::IRNSS) {
     
    125126    GPSADDBITS(6, eph._health)
    126127    GPSADDBITS(1, eph._L2PFlag)
    127     GPSADDBITS(1, eph._fitInterval)
     128    (eph._fitInterval == 4.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
     129    GPSADDBITS(1, fitIntervalFlag)
    128130  }
    129131
Note: See TracChangeset for help on using the changeset viewer.