Changeset 8628 in ntrip for branches/BNC_2.12/src/RTCM3

Timestamp:

Mar 13, 2019, 7:41:10 AM (5 years ago)

Author:

stuerze

Message:

some updates to support RINEX Version 3.04

Location:

branches/BNC_2.12/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (5 diffs)
• clock_and_orbit/clock_orbit_rtcm.h (modified) (4 diffs)

branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

@@ -687 +687 @@
       case CODETYPEGPS_L1_P:          return "1P";
       case CODETYPEGPS_L1_Z:          return "1W";
-      //case CODETYPEGPS_L1_Y:          return "1Y";
-      //case CODETYPEGPS_L1_M:          return "1M";
+      case CODETYPEGPS_L1_Y:          return "1Y";
+      case CODETYPEGPS_L1_M:          return "1M";
       case CODETYPEGPS_L2_CA:         return "2C";
       case CODETYPEGPS_SEMI_CODELESS: return "2D";
-      case CODETYPEGPS_L2_CM:         return "2S";
-      case CODETYPEGPS_L2_CL:         return "2L";
-      case CODETYPEGPS_L2_CML:        return "2X";
+      case CODETYPEGPS_L2C_M:         return "2S";
+      case CODETYPEGPS_L2C_L:         return "2L";
+      case CODETYPEGPS_L2C_ML:        return "2X";
       case CODETYPEGPS_L2_P:          return "2P";
       case CODETYPEGPS_L2_Z:          return "2W";
-      //case CODETYPEGPS_L2_Y:          return "2Y";
-      //case CODETYPEGPS_L2_M:          return "2M";
+      case CODETYPEGPS_L2_Y:          return "2Y";
+      case CODETYPEGPS_L2_M:          return "2M";
       case CODETYPEGPS_L5_I:          return "5I";
       case CODETYPEGPS_L5_Q:          return "5Q";
@@ -713 +713 @@
       case CODETYPEGLONASS_L2_CA:     return "2C";
       case CODETYPEGLONASS_L2_P:      return "2P";
+      case CODETYPEGLONASS_L1a_OCd:   return "4A";
+      case CODETYPEGLONASS_L1a_OCp:   return "4B";
+      case CODETYPEGLONASS_L1a_OCdp:  return "4X";
+      case CODETYPEGLONASS_L2a_CSI:   return "6A";
+      case CODETYPEGLONASS_L2a_OCp:   return "6B";
+      case CODETYPEGLONASS_L2a_CSIOCp:return "6X";
       case CODETYPEGLONASS_L3_I:      return "3I";
       case CODETYPEGLONASS_L3_Q:      return "3Q";
@@ -748 +754 @@
       case CODETYPEQZSS_L1C_D:         return "1S";
       case CODETYPEQZSS_L1C_P:         return "1L";
-      case CODETYPEQZSS_L1C_DP:        return "1X";
       case CODETYPEQZSS_L2C_M:         return "2S";
       case CODETYPEQZSS_L2C_L:         return "2L";
@@ -755 +760 @@
       case CODETYPEQZSS_L5_Q:          return "5Q";
       case CODETYPEQZSS_L5_IQ:         return "5X";
-      case CODETYPEQZSS_LEX_S:         return "6S";
-      case CODETYPEQZSS_LEX_L:         return "6L";
-      case CODETYPEQZSS_LEX_SL:        return "6X";
+      case CODETYPEQZSS_L6_D:          return "6S";
+      case CODETYPEQZSS_L6_P:          return "6L";
+      case CODETYPEQZSS_L6_DP:         return "6X";
+      case CODETYPEQZSS_L1C_DP:        return "1X";
+      case CODETYPEQZSS_L1_S:          return "1Z";
+      case CODETYPEQZSS_L5_D:          return "5D";
+      case CODETYPEQZSS_L5_P:          return "5P";
+      case CODETYPEQZSS_L5_DP:         return "5Z";
+      case CODETYPEQZSS_L6_E:          return "6E";
+      case CODETYPEQZSS_L6_DE:         return "6Z";
       default: return "";
     }
@@ -775 +787 @@
       case CODETYPE_BDS_B1_Q:         return "2Q";
       case CODETYPE_BDS_B1_IQ:        return "2X";
+      case CODETYPE_BDS_B3_I:         return "6I";
+      case CODETYPE_BDS_B3_Q:         return "6Q";
+      case CODETYPE_BDS_B3_IQ:        return "6X";
       case CODETYPE_BDS_B2_I:         return "7I";
       case CODETYPE_BDS_B2_Q:         return "7Q";
       case CODETYPE_BDS_B2_IQ:        return "7X";
-      case CODETYPE_BDS_B3_I:         return "6I";
-      case CODETYPE_BDS_B3_Q:         return "6Q";
-      case CODETYPE_BDS_B3_IQ:        return "6X";
+      case CODETYPE_BDS_B1a_D:        return "1D";
+      case CODETYPE_BDS_B1a_P:        return "1P";
+      case CODETYPE_BDS_B1a_DP:       return "1X";
+      case CODETYPE_BDS_B2a_D:        return "2D";
+      case CODETYPE_BDS_B2a_P:        return "2P";
+      case CODETYPE_BDS_B2a_DP:       return "2X";
       default: return "";
     }

branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

@@ -144 +144 @@
   CODETYPEGPS_L1_P           = 1,
   CODETYPEGPS_L1_Z           = 2,
-  /*CODETYPEGPS_L1_Y         = 3,
-  CODETYPEGPS_L1_M           = 4,*/
+  CODETYPEGPS_L1_Y           = 3,
+  CODETYPEGPS_L1_M           = 4,
   CODETYPEGPS_L2_CA          = 5,
   CODETYPEGPS_SEMI_CODELESS  = 6,
-  CODETYPEGPS_L2_CM          = 7,
-  CODETYPEGPS_L2_CL          = 8,
-  CODETYPEGPS_L2_CML         = 9,
+  CODETYPEGPS_L2C_M          = 7,
+  CODETYPEGPS_L2C_L          = 8,
+  CODETYPEGPS_L2C_ML         = 9,
   CODETYPEGPS_L2_P           = 10,
   CODETYPEGPS_L2_Z           = 11,
-  /*CODETYPEGPS_L2_Y         = 12,
-  CODETYPEGPS_L2_M           = 13,*/
+  CODETYPEGPS_L2_Y           = 12,
+  CODETYPEGPS_L2_M           = 13,
   CODETYPEGPS_L5_I           = 14,
   CODETYPEGPS_L5_Q           = 15,
@@ -166 +166 @@
   CODETYPEGLONASS_L2_CA      = 2,
   CODETYPEGLONASS_L2_P       = 3,
-  CODETYPEGLONASS_L3_I       = 4,
-  CODETYPEGLONASS_L3_Q       = 5,
-  CODETYPEGLONASS_L3_IQ      = 6,
+  CODETYPEGLONASS_L1a_OCd    = 4,
+  CODETYPEGLONASS_L1a_OCp    = 5,
+  CODETYPEGLONASS_L1a_OCdp   = 6,
+  CODETYPEGLONASS_L2a_CSI    = 7,
+  CODETYPEGLONASS_L2a_OCp    = 8,
+  CODETYPEGLONASS_L2a_CSIOCp = 9,
+  CODETYPEGLONASS_L3_I       = 10,
+  CODETYPEGLONASS_L3_Q       = 11,
+  CODETYPEGLONASS_L3_IQ      = 12,
+
 
   CODETYPEGALILEO_E1_A       = 0,
@@ -199 +206 @@
   CODETYPEQZSS_L5_Q          = 7,
   CODETYPEQZSS_L5_IQ         = 8,
-  CODETYPEQZSS_LEX_S         = 9,
-  CODETYPEQZSS_LEX_L         = 10,
-  CODETYPEQZSS_LEX_SL        = 11,
+  CODETYPEQZSS_L6_D          = 9,
+  CODETYPEQZSS_L6_P          = 10,
+  CODETYPEQZSS_L6_DP         = 11,
   CODETYPEQZSS_L1C_DP        = 12,
+  CODETYPEQZSS_L1_S          = 13,
+  CODETYPEQZSS_L5_D          = 14,
+  CODETYPEQZSS_L5_P          = 15,
+  CODETYPEQZSS_L5_DP         = 16,
+  CODETYPEQZSS_L6_E          = 17,
+  CODETYPEQZSS_L6_DE         = 18,
 
   CODETYPE_SBAS_L1_CA        = 0,
@@ -218 +231 @@
   CODETYPE_BDS_B2_Q          = 7,
   CODETYPE_BDS_B2_IQ         = 8,
+  CODETYPE_BDS_B1a_D         = 9,
+  CODETYPE_BDS_B1a_P         = 10,
+  CODETYPE_BDS_B1a_DP        = 11,
+  CODETYPE_BDS_B2a_D         = 12,
+  CODETYPE_BDS_B2a_P         = 13,
+  CODETYPE_BDS_B2a_DP        = 14
 };