Ignore:
Timestamp:
Sep 2, 2020, 10:42:48 PM (4 years ago)
Author:
stuerze
Message:

adjusted allocation of slip and LTI according to the respective RTCM version

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r9048 r9088  
    148148      frqObs->_codeValid = frqObs->_phaseValid = true;
    149149    }
    150     GETBITS(i, 7);
    151     frqObs->_lockTime = lti2sec(type,i);
     150    GETBITS(frqObs->_lockTimeIndicator, 7);
     151    frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    152152    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    153     frqObs->_slipCounter = i;
    154153    if (type == 1002 || type == 1004) {
    155154      GETBITS(amb, 8);
    … …  
    194193        frqObs->_phaseValid = true;
    195194      }
    196       GETBITS(i, 7);
    197       frqObs->_lockTime = lti2sec(type,i);
     195      GETBITS(frqObs->_lockTimeIndicator, 7);
     196      frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    198197      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    199       frqObs->_slipCounter = i;
    200198      if (type == 1004) {
    201199        GETBITS(i, 8);
    … …  
    768766                  frqObs->_lockTime = lti2sec(type,ll[count]);
    769767                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    770                   frqObs->_slipCounter = ll[count];
     768                  frqObs->_lockTimeIndicator = ll[count];
    771769                }
    772770                break;
    … …  
    783781                  frqObs->_lockTime = lti2sec(type,ll[count]);
    784782                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    785                   frqObs->_slipCounter = ll[count];
     783                  frqObs->_lockTimeIndicator = ll[count];
    786784                }
    787785                break;
    … …  
    798796                  frqObs->_lockTime = lti2sec(type,ll[count]);
    799797                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    800                   frqObs->_slipCounter = ll[count];
     798                  frqObs->_lockTimeIndicator = ll[count];
    801799                }
    802800                frqObs->_snr = cnr[count];
    … …  
    815813                  frqObs->_lockTime = lti2sec(type,ll[count]);
    816814                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    817                   frqObs->_slipCounter = ll[count];
     815                  frqObs->_lockTimeIndicator = ll[count];
    818816                }
    819817                frqObs->_snr = cnr[count];
    … …  
    836834                  frqObs->_lockTime = lti2sec(type,ll[count]);
    837835                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    838                   frqObs->_slipCounter = ll[count];
     836                  frqObs->_lockTimeIndicator = ll[count];
    839837                }
    840838
    … …  
    854852                  frqObs->_lockTime = lti2sec(type,ll[count]);
    855853                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    856                   frqObs->_slipCounter = ll[count];
     854                  frqObs->_lockTimeIndicator = ll[count];
    857855                }
    858856
    … …  
    938936    if ((i & ((1 << 20) - 1)) != 0x80000) {
    939937      frqObs->_code = l1range * 0.02;
    940       frqObs->_phase = (l1range * 0.02 + i * 0.0005)
    941           / GLO_WAVELENGTH_L1(freq - 7);
     938      frqObs->_phase = (l1range * 0.02 + i * 0.0005) / GLO_WAVELENGTH_L1(freq - 7);
    942939      frqObs->_codeValid = frqObs->_phaseValid = true;
    943940    }
    944     GETBITS(i, 7);
    945     frqObs->_lockTime = lti2sec(type,i);
     941    GETBITS(frqObs->_lockTimeIndicator, 7);
     942    frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    946943    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    947     frqObs->_slipCounter = i;
    948944    if (type == 1010 || type == 1012) {
    949945      GETBITS(amb, 7);
    … …  
    988984        frqObs->_phaseValid = true;
    989985      }
    990       GETBITS(i, 7);
    991       frqObs->_lockTime = lti2sec(type,i);
     986      GETBITS(frqObs->_lockTimeIndicator, 7);
     987      frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    992988      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    993       frqObs->_slipCounter = i;
    994989      if (type == 1012) {
    995990        GETBITS(i, 8);
Note: See TracChangeset for help on using the changeset viewer.