Changeset 9000 in ntrip


Ignore:
Timestamp:
Jul 23, 2020, 11:26:50 PM (3 weeks ago)
Author:
stuerze
Message:

some updates regarding BDS and IRNSS mesage numbers and signal mapping

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

Legend:

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

    r8986 r9000  
    411411        {BDS_WAVELENGTH_B2a, "5P"},
    412412        {BDS_WAVELENGTH_B2a, "5X"},
    413         {0.0, 0},
     413        {BDS_WAVELENGTH_B2b, "7D"},
    414414        {0.0, 0},
    415415        {0.0, 0},
     
    16311631       * else. */
    16321632      if ((id >= 1057 && id <= 1068) ||
    1633             (id >= 1240 && id <= 1270) ||
    1634                       (id == 4076)) {
     1633          (id >= 1240 && id <= 1270) ||
     1634                  (id == 4076)) {
    16351635        if (!_coDecoders.contains(_staID.toLatin1()))
    16361636          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
     
    16411641        }
    16421642      }
    1643       else if ((id >= 1070 && id <= 1229) ||
    1644                (id >=   21 && id <=   27)) /* MSM */ {
     1643      else if (id >= 1070 && id <= 1229) { /* MSM */
    16451644        if (DecodeRTCM3MSM(_Message, _BlockSize))
    16461645          decoded = true;
     
    16861685              decoded = true;
    16871686            break;
    1688           case 29:
     1687          case 1141:
    16891688            if (DecodeIRNSSEphemeris(_Message, _BlockSize))
    16901689              decoded = true;
     
    16951694              decoded = true;
    16961695            break;
    1697           case RTCM3ID_BDS:
     1696          case 1042:
    16981697            if (DecodeBDSEphemeris(_Message, _BlockSize))
    16991698              decoded = true;
  • trunk/BNC/src/RTCM3/ephEncoder.cpp

    r8853 r9000  
    5151    GPSADDBITS(3, 0) /* padding */
    5252  } else if (eph.type() == t_eph::IRNSS) {
    53     GPSADDBITS(12, 29)
     53    GPSADDBITS(12, 1141)
    5454    GPSADDBITS(6, eph._prn.number())
    5555    GPSADDBITS(10, eph._TOC.gpsw())
     
    316316
    317317  int URA = indexFromAccuracy(eph._URA, eph.type());
    318   BDSADDBITS(12, RTCM3ID_BDS)
     318  BDSADDBITS(12, 1042)
    319319  BDSADDBITS(6, eph._prn.number())
    320320  BDSADDBITS(13, eph._TOC.bdsw())
  • trunk/BNC/src/RTCM3/gnss.h

    r8801 r9000  
    7474#define BDS_FREQU_B1C       1575420000.0  /* Hz */
    7575#define BDS_FREQU_B2a       1176450000.0  /* Hz */
     76#define BDS_FREQU_B2b       1207140000.0  /* Hz */
    7677#define BDS_WAVELENGTH_B1   (LIGHTSPEED / BDS_FREQU_B1)  /* m */
    7778#define BDS_WAVELENGTH_B2   (LIGHTSPEED / BDS_FREQU_B2)  /* m */
     
    7980#define BDS_WAVELENGTH_B1C  (LIGHTSPEED / BDS_FREQU_B1C) /* m */
    8081#define BDS_WAVELENGTH_B2a  (LIGHTSPEED / BDS_FREQU_B2a) /* m */
     82#define BDS_WAVELENGTH_B2b  (LIGHTSPEED / BDS_FREQU_B2b) /* m */
    8183
    8284#define IRNSS_FREQU_L5      1176450000.0 /* Hz */
     
    8789#define R2R_PI          3.1415926535898
    8890
    89 #define RTCM3ID_BDS 1042
    90 
    9191#endif /* GNSS_H */
Note: See TracChangeset for help on using the changeset viewer.