From e4a8f08045d416a0a72af462578ed8aa4ab540e6 Mon Sep 17 00:00:00 2001
From: Tim Everett <tim.everett3@gmail.com>
Date: Sat, 2 Nov 2019 14:35:35 -0600
Subject: [PATCH] - Replace BDS 2I,2Q,2X to 1I,1Q,1X codes from RTCM3 decoding
 to match RTCM3.1 spec (also see last check-in) - Change GPS L2C(M) code for
 u-blox F9P from L2M to L2S to match Rinex spec

---
 src/convrnx.c   | 2 +-
 src/rcv/ublox.c | 6 +++---
 src/rtcm3.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/convrnx.c b/src/convrnx.c
index 2152772..66de4f1 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 ffb0289..16ab559 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 ac42896..636c2fe 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",""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,
     ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""
 };
-- 
GitLab