Changeset 8682 in ntrip for trunk


Ignore:
Timestamp:
Apr 12, 2019, 2:03:24 PM (6 weeks ago)
Author:
stuerze
Message:

minor changes in RTCM3 Decoder with respect to MSM obs codes

Location:
trunk/BNC/src
Files:
3 edited

Legend:

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

    r8617 r8682  
    196196      GETBITS(i, 7);
    197197      frqObs->_lockTime = lti2sec(type,i);
    198       frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);     
     198      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    199199      frqObs->_slipCounter = i;
    200200      if (type == 1004) {
     
    356356        {0.0, 0},
    357357        {0.0, 0},
    358         {GPS_WAVELENGTH_L1, "1Z"},
    359         {0.0, 0},
    360         {0.0, 0},
    361         {QZSS_WAVELENGTH_LEX, "6S"},
    362         {QZSS_WAVELENGTH_LEX, "6L"},
    363         {QZSS_WAVELENGTH_LEX, "6X"},
     358        {GPS_WAVELENGTH_L1, "1Z"},// not defined in RTCM3.3?
     359        {0.0, 0},
     360        {0.0, 0},
     361        {QZSS_WAVELENGTH_L6, "6S"},
     362        {QZSS_WAVELENGTH_L6, "6L"},
     363        {QZSS_WAVELENGTH_L6, "6X"},
    364364        {0.0, 0},
    365365        {0.0, 0},
     
    380380        {0.0, 0},
    381381        {0.0, 0},
    382         {GPS_WAVELENGTH_L1, "1D"},
    383         {GPS_WAVELENGTH_L1, "1P"},
     382        {GPS_WAVELENGTH_L1, "1S"},
     383        {GPS_WAVELENGTH_L1, "1L"},
    384384        {GPS_WAVELENGTH_L1, "1X"}
    385385    };
     
    389389        {0.0, 0},
    390390        {BDS_WAVELENGTH_B1, "2I"},
    391         {0.0, 0},
    392         {0.0, 0},
     391        {BDS_WAVELENGTH_B1, "2Q"},
     392        {BDS_WAVELENGTH_B1, "2X"},
    393393        {0.0, 0},
    394394        {0.0, 0},
    395395        {0.0, 0},
    396396        {BDS_WAVELENGTH_B3, "6I"},
    397         {0.0, 0},
    398         {0.0, 0},
     397        {BDS_WAVELENGTH_B3, "6Q"},
     398        {BDS_WAVELENGTH_B3, "6X"},
    399399        {0.0, 0},
    400400        {0.0, 0},
    401401        {0.0, 0},
    402402        {BDS_WAVELENGTH_B2, "7I"},
    403         {0.0, 0},
    404         {0.0, 0},
     403        {BDS_WAVELENGTH_B2, "7Q"},
     404        {BDS_WAVELENGTH_B2, "7X"},
    405405        {0.0, 0},
    406406        {0.0, 0},
     
    719719                  frqObs->_phaseValid = true;
    720720                  frqObs->_lockTime = lti2sec(type,ll[count]);
    721                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     721                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    722722                  frqObs->_slipCounter = ll[count];
    723723                }
     
    735735                  frqObs->_phaseValid = true;
    736736                  frqObs->_lockTime = lti2sec(type,ll[count]);
    737                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     737                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    738738                  frqObs->_slipCounter = ll[count];
    739739                }
     
    752752                  frqObs->_phaseValid = true;
    753753                  frqObs->_lockTime = lti2sec(type,ll[count]);
    754                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     754                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    755755                  frqObs->_slipCounter = ll[count];
    756756                }
     
    772772                  frqObs->_phaseValid = true;
    773773                  frqObs->_lockTime = lti2sec(type,ll[count]);
    774                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     774                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    775775                  frqObs->_slipCounter = ll[count];
    776776                }
     
    797797                  frqObs->_phaseValid = true;
    798798                  frqObs->_lockTime = lti2sec(type,ll[count]);
    799                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     799                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    800800                  frqObs->_slipCounter = ll[count];
    801801                }
     
    817817                  frqObs->_phaseValid = true;
    818818                  frqObs->_lockTime = lti2sec(type,ll[count]);
    819                   frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                 
     819                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
    820820                  frqObs->_slipCounter = ll[count];
    821821                }
     
    907907    GETBITS(i, 7);
    908908    frqObs->_lockTime = lti2sec(type,i);
    909     frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);   
     909    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    910910    frqObs->_slipCounter = i;
    911911    if (type == 1010 || type == 1012) {
     
    953953      GETBITS(i, 7);
    954954      frqObs->_lockTime = lti2sec(type,i);
    955       frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);     
     955      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
    956956      frqObs->_slipCounter = i;
    957957      if (type == 1012) {
  • trunk/BNC/src/RTCM3/gnss.h

    r8136 r8682  
    5757#define QZSS_FREQU_L2       1227600000.0  /* Hz */
    5858#define QZSS_FREQU_L5       1176450000.0  /* Hz */
    59 #define QZSS_FREQU_LEX      1278750000.0 /* Hz */
     59#define QZSS_FREQU_L6      1278750000.0 /* Hz */
    6060#define QZSS_WAVELENGTH_L1  (LIGHTSPEED / QZSS_FREQU_L1) /* m */
    6161#define QZSS_WAVELENGTH_L2  (LIGHTSPEED / QZSS_FREQU_L2) /* m */
    6262#define QZSS_WAVELENGTH_L5  (LIGHTSPEED / QZSS_FREQU_L5) /* m */
    63 #define QZSS_WAVELENGTH_LEX (LIGHTSPEED / QZSS_FREQU_LEX) /* m */
     63#define QZSS_WAVELENGTH_L6  (LIGHTSPEED / QZSS_FREQU_L6) /* m */
    6464
    6565#define BDS_FREQU_B1       1561098000.0  /* Hz */
  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r8659 r8682  
    355355                   << "C8X" << "L8X" << "S8X";
    356356
     357
    357358    _obsTypes['S'] << "C1C" << "L1C" << "S1C"
    358359                   << "C5I" << "L5I" << "S5I"
    359                    << "C5Q" << "L5Q" << "S5Q";
     360                   << "C5Q" << "L5Q" << "S5Q"
     361                   << "C5X" << "L5X" << "S5X";
    360362
    361363    _obsTypes['C'] << "C2I" << "L2I" << "S2I"
     364                   << "C2Q" << "L2Q" << "S2Q"
     365                   << "C2X" << "L2X" << "S2X"
    362366                   << "C6I" << "L6I" << "S6I"
    363                    << "C7I" << "L7I" << "S7I";
     367                   << "C6Q" << "L6Q" << "S6Q"
     368                   << "C6X" << "L6X" << "S6X"
     369                   << "C7I" << "L7I" << "S7I"
     370                   << "C7Q" << "L7Q" << "S7Q"
     371                   << "C7X" << "L7X" << "S7X";
    364372
    365373    _obsTypes['I'] << "C5A" << "L5A" << "S5A"
Note: See TracChangeset for help on using the changeset viewer.