Merge pull request #478 from ourairquality/rtcm3-msm-add-signals

rtcm3 msm: add signal types R3 R4 R6, L9
rtklibexplorer · Oct 2, 2024 · 38f579d · 38f579d
2 parents 3bf4841 + e3df221
commit 38f579d
Showing 1 changed file with 28 additions and 34 deletions.
diff --git a/src/rtcm3.c b/src/rtcm3.c
@@ -80,48 +80,42 @@ typedef struct {                    /* multi-signal-message header type */
 } msm_h_t;
 
 /* MSM signal ID table -------------------------------------------------------*/
-const char *msm_sig_gps[32]={
+const char *msm_sig_gps[32] = {
     /* GPS: ref [17] table 3.5-91 */
-    ""  ,"1C","1P","1W",""  ,""  ,""  ,"2C","2P","2W",""  ,""  , /*  1-12 */
-    ""  ,""  ,"2S","2L","2X",""  ,""  ,""  ,""  ,"5I","5Q","5X", /* 13-24 */
-    ""  ,""  ,""  ,""  ,""  ,"1S","1L","1X"                      /* 25-32 */
+    "", "1C", "1P", "1W", "",   "",   "",   "2C", "2P", "2W", "",   "",    //  1-12
+    "", "",   "2S", "2L", "2X", "",   "",   "",   "",   "5I", "5Q", "5X",  // 13-24
+    "", "",   "",   "",   "",   "1S", "1L", "1X"                           // 25-32
 };
-const char *msm_sig_glo[32]={
+const char *msm_sig_glo[32] = {
     /* GLONASS: ref [17] table 3.5-96 */
-    ""  ,"1C","1P",""  ,""  ,""  ,""  ,"2C","2P",""  ,""  ,""  ,
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""
-};
-const char *msm_sig_gal[32]={
+    "",   "1C", "1P", "",   "",   "", "", "2C", "2P", "4A", "4X", "6A",  //  1-12
+    "6B", "6X", "3I", "3Q", "3X", "", "", "",   "",   "",   "",   "",    // 13-24
+    "",   "",   "",   "",   "",   "", "", ""};                           // 25-32
+const char *msm_sig_gal[32] = {
     /* Galileo: ref [17] table 3.5-99 */
-    ""  ,"1C","1A","1B","1X","1Z",""  ,"6C","6A","6B","6X","6Z",
-    ""  ,"7I","7Q","7X",""  ,"8I","8Q","8X",""  ,"5I","5Q","5X",
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""
-};
-const char *msm_sig_qzs[32]={
+    "", "1C", "1A", "1B", "1X", "1Z", "",   "6C", "6A", "6B", "6X", "6Z",  //  1-12
+    "", "7I", "7Q", "7X", "",   "8I", "8Q", "8X", "",   "5I", "5Q", "5X",  // 13-24
+    "", "",   "",   "",   "",   "",   "",   ""};                           // 25-32
+const char *msm_sig_qzs[32] = {
     /* QZSS: ref [17] table 3.5-105 */
-    ""  ,"1C",""  ,""  ,""  ,""  ,""  ,""  ,"6S","6L","6X",""  ,
-    ""  ,""  ,"2S","2L","2X",""  ,""  ,""  ,""  ,"5I","5Q","5X",
-    ""  ,""  ,""  ,""  ,""  ,"1S","1L","1X"
-};
-const char *msm_sig_sbs[32]={
+    "", "1C", "",   "",   "",   "",   "",   "",  "6S", "6L", "6X", "",    //  1-12
+    "", "",   "2S", "2L", "2X", "",   "",   "",  "",   "5I", "5Q", "5X",  // 13-24
+    "", "",   "",   "",   "",   "1S", "1L", "1X"};                        // 25-32
+const char *msm_sig_sbs[32] = {
     /* SBAS: ref [17] table 3.5-102 */
-    ""  ,"1C",""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,"5I","5Q","5X",
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""
-};
-const char *msm_sig_cmp[32]={
+    "", "1C", "", "", "", "", "", "", "", "",   "",   "",    //  1-12
+    "", "",   "", "", "", "", "", "", "", "5I", "5Q", "5X",  // 13-24
+    "", "",   "", "", "", "", "", ""};                       // 25-32
+const char *msm_sig_cmp[32] = {
     /* BeiDou: ref [17] table 3.5-108 */
-    ""  ,"2I","2Q","2X","","",""  ,"6I","6Q","6X",""  ,""  ,
-    ""  ,"7I","7Q","7X",""  ,""  ,""  ,""  ,""  ,"5D"  ,"5P"  ,"5X"  ,
-    "7D"  ,""  ,""  ,""  ,""  ,"1D"  ,"1P"  ,"1X"
-};
-const char *msm_sig_irn[32]={
+    "",   "2I", "2Q", "2X", "", "",   "",   "6I", "6Q", "6X", "",   "",    //  1-12
+    "",   "7I", "7Q", "7X", "", "",   "",   "",   "",   "5D", "5P", "5X",  // 13-24
+    "7D", "",   "",   "",   "", "1D", "1P", "1X"};                         // 25-32
+const char *msm_sig_irn[32] = {
     /* NavIC/IRNSS: ref [17] table 3.5-108.3 */
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,""  ,"5A",""  ,""  ,
-    ""  ,""  ,""  ,""  ,""  ,""  ,""  ,""
-};
+    "", "", "", "", "", "", "", "9A", "", "",   "", "",  //  1-12
+    "", "", "", "", "", "", "", "",   "", "5A", "", "",  // 13-24
+    "", "", "", "", "", "", "", ""};                     // 25-32
 /* SSR signal and tracking mode IDs ------------------------------------------*/
 const uint8_t ssr_sig_gps[32]={
     CODE_L1C,CODE_L1P,CODE_L1W,CODE_L1S,CODE_L1L,CODE_L2C,CODE_L2D,CODE_L2S,