Changeset 9001 in ntrip


Ignore:
Timestamp:
Jul 23, 2020, 11:28:20 PM (2 weeks ago)
Author:
stuerze
Message:

some updates regarding BDS and IRNSS mesage numbers and signal mapping

Location:
branches/BNC_2.12/src/RTCM3
Files:
3 edited

Legend:

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

    r8987 r9001  
    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},
     
    16231623       * extracted data block. That does no harm, as it anyway skip everything
    16241624       * else. */
    1625       if ((id >= 1057 && id <= 1068) || 
     1625      if ((id >= 1057 && id <= 1068) ||
    16261626          (id >= 1240 && id <= 1270) ||
    16271627          (id == 4076)) {
     
    16341634        }
    16351635      }
    1636       else if ((id >= 1070 && id <= 1229) ||
    1637                (id >=   21 && id <=   27)) /* MSM */ {
     1636     else if (id >= 1070 && id <= 1229) { /* MSM */
    16381637        if (DecodeRTCM3MSM(_Message, _BlockSize))
    16391638          decoded = true;
     
    16791678              decoded = true;
    16801679            break;
    1681           case 29:
     1680          case 1141:
    16821681            if (DecodeIRNSSEphemeris(_Message, _BlockSize))
    16831682              decoded = true;
     
    16881687              decoded = true;
    16891688            break;
    1690           case RTCM3ID_BDS:
     1689          case 1042:
    16911690            if (DecodeBDSEphemeris(_Message, _BlockSize))
    16921691              decoded = true;
  • branches/BNC_2.12/src/RTCM3/ephEncoder.cpp

    r8854 r9001  
    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())
  • branches/BNC_2.12/src/RTCM3/gnss.h

    r8806 r9001  
    2626#define GNSS_H
    2727
    28 #define LIGHTSPEED         2.99792458e8    /* m/sec */
    29 #define GPS_FREQU_L1       1575420000.0  /* Hz */
    30 #define GPS_FREQU_L2       1227600000.0  /* Hz */
    31 #define GPS_FREQU_L5       1176450000.0  /* Hz */
    32 #define GPS_WAVELENGTH_L1  (LIGHTSPEED / GPS_FREQU_L1) /* m */
    33 #define GPS_WAVELENGTH_L2  (LIGHTSPEED / GPS_FREQU_L2) /* m */
    34 #define GPS_WAVELENGTH_L5  (LIGHTSPEED / GPS_FREQU_L5) /* m */
     28#define LIGHTSPEED          2.99792458e8    /* m/sec */
     29#define GPS_FREQU_L1        1575420000.0  /* Hz */
     30#define GPS_FREQU_L2        1227600000.0  /* Hz */
     31#define GPS_FREQU_L5        1176450000.0  /* Hz */
     32#define GPS_WAVELENGTH_L1   (LIGHTSPEED / GPS_FREQU_L1) /* m */
     33#define GPS_WAVELENGTH_L2   (LIGHTSPEED / GPS_FREQU_L2) /* m */
     34#define GPS_WAVELENGTH_L5   (LIGHTSPEED / GPS_FREQU_L5) /* m */
    3535
    3636#define GLO_FREQU_L1_BASE   1602000000.0  /* Hz */
     
    4949#define GLO_WAVELENGTH_L3    (LIGHTSPEED / GLO_FREQU_L3)    /* m */
    5050
    51 #define GAL_FREQU_E1       1575420000.0  /* Hz */
    52 #define GAL_FREQU_E5A      1176450000.0  /* Hz */
    53 #define GAL_FREQU_E5AB     1191795000.0  /* Hz */
    54 #define GAL_FREQU_E5B      1207140000.0  /* Hz */
    55 #define GAL_FREQU_E6       1278750000.0  /* Hz */
     51#define GAL_FREQU_E1          1575420000.0  /* Hz */
     52#define GAL_FREQU_E5A         1176450000.0  /* Hz */
     53#define GAL_FREQU_E5AB        1191795000.0  /* Hz */
     54#define GAL_FREQU_E5B         1207140000.0  /* Hz */
     55#define GAL_FREQU_E6          1278750000.0  /* Hz */
    5656#define GAL_WAVELENGTH_E1     (LIGHTSPEED / GAL_FREQU_E1) /* m */
    5757#define GAL_WAVELENGTH_E5A    (LIGHTSPEED / GAL_FREQU_E5A) /* m */
     
    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.