diff --git a/src/convrnx.c b/src/convrnx.c index 215277217e9c87923ff2c2591892c487547cce95..66de4f104b69b537b870becfa761cf503c39ad48 100644 --- a/src/convrnx.c +++ b/src/convrnx.c @@ -794,7 +794,7 @@ static void set_obstype(int format, rnxopt_t *opt) {0} }; static const unsigned char codes_other[NSATSYS][8]={ /* others inc u-blox */ - {CODE_L1C,CODE_L2L}, + {CODE_L1C,CODE_L2L,CODE_L2S}, {CODE_L1C,CODE_L2C}, {CODE_L1C,CODE_L1X,CODE_L7Q}, {CODE_L1C}, diff --git a/src/rcv/ublox.c b/src/rcv/ublox.c index ffb0289a4602f7c105fa1bc48ff9d04f9a15ef7e..16ab5599ac56c9c4f5772fa2f34658d8178af761 100644 --- a/src/rcv/ublox.c +++ b/src/rcv/ublox.c @@ -162,8 +162,8 @@ static int ubx_sig(int sys, int sigid) { if (sys == SYS_GPS) { if (sigid == 0) return CODE_L1C; /* L1C/A */ - if (sigid == 3) return CODE_L2L; /* L2CL */ - if (sigid == 4) return CODE_L2M; /* L2CM */ + if (sigid == 3) return CODE_L2L; /* L2C(L) */ + if (sigid == 4) return CODE_L2S; /* L2C(M) */ } else if (sys == SYS_GLO) { if (sigid == 0) return CODE_L1C; /* G1C/A (GLO L1 OF) */ @@ -196,7 +196,7 @@ static int sig_idx(int sys, int code) if (sys == SYS_GPS) { if (code==CODE_L1C) return 1; if (code==CODE_L2L) return 2; - if (code==CODE_L2M) return 2; + if (code==CODE_L2S) return 2; } else if (sys == SYS_GLO) { if (code==CODE_L1C) return 1; diff --git a/src/rtcm3.c b/src/rtcm3.c index ac42896e682c298f4cdec909c024c656575d254a..636c2fecd31c62af4d2f02f09ae1f1cbe8abbf5a 100644 --- a/src/rtcm3.c +++ b/src/rtcm3.c @@ -100,8 +100,8 @@ const char *msm_sig_sbs[32]={ "" ,"" ,"" ,"" ,"" ,"" ,"" ,"" }; const char *msm_sig_cmp[32]={ - /* BeiDou: ref [15] table 3.5-106 */ - "" ,"2I","2Q","2X","1I","1Q","1X" ,"6I","6Q","6X","" ,"" , + /* BeiDou: ref [17] table 3.5-108 */ + "" ,"2I","2Q","2X","","","" ,"6I","6Q","6X","" ,"" , "" ,"7I","7Q","7X","" ,"" ,"" ,"" ,"" ,"" ,"" ,"" , "" ,"" ,"" ,"" ,"" ,"" ,"" ,"" };