Ignore:
Timestamp:
Sep 2, 2020, 10:49:54 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

  • branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

    r9049 r9089  
    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;
    … …  
    777775                  frqObs->_codeValid = true;
    778776                }
    779 
    780777                if (cp[count] > -1.0 / (1 << 8)) {
    781778                  frqObs->_phase = cp[count] * LIGHTSPEED / 1000.0 / cd.wl
    … …  
    784781                  frqObs->_lockTime = lti2sec(type,ll[count]);
    785782                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    786                   frqObs->_slipCounter = ll[count];
     783                  frqObs->_lockTimeIndicator = ll[count];
    787784                }
    788785                break;
    … …  
    799796                  frqObs->_lockTime = lti2sec(type,ll[count]);
    800797                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    801                   frqObs->_slipCounter = ll[count];
     798                  frqObs->_lockTimeIndicator = ll[count];
    802799                }
    803800                frqObs->_snr = cnr[count];
    … …  
    816813                  frqObs->_lockTime = lti2sec(type,ll[count]);
    817814                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    818                   frqObs->_slipCounter = ll[count];
     815                  frqObs->_lockTimeIndicator = ll[count];
    819816                }
    820817                frqObs->_snr = cnr[count];
    … …  
    837834                  frqObs->_lockTime = lti2sec(type,ll[count]);
    838835                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    839                   frqObs->_slipCounter = ll[count];
     836                  frqObs->_lockTimeIndicator = ll[count];
    840837                }
    841838
    … …  
    855852                  frqObs->_lockTime = lti2sec(type,ll[count]);
    856853                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    857                   frqObs->_slipCounter = ll[count];
     854                  frqObs->_lockTimeIndicator = ll[count];
    858855                }
    859856
    … …  
    943940      frqObs->_codeValid = frqObs->_phaseValid = true;
    944941    }
    945     GETBITS(i, 7);
    946     frqObs->_lockTime = lti2sec(type,i);
     942    GETBITS(frqObs->_lockTimeIndicator, 7);
     943    frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    947944    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    948     frqObs->_slipCounter = i;
    949945    if (type == 1010 || type == 1012) {
    950946      GETBITS(amb, 7);
    … …  
    989985        frqObs->_phaseValid = true;
    990986      }
    991       GETBITS(i, 7);
    992       frqObs->_lockTime = lti2sec(type,i);
     987      GETBITS(frqObs->_lockTimeIndicator, 7);
     988      frqObs->_lockTime = lti2sec(type, frqObs->_lockTimeIndicator);
    993989      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    994       frqObs->_slipCounter = i;
    995990      if (type == 1012) {
    996991        GETBITS(i, 8);
Note: See TracChangeset for help on using the changeset viewer.