Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h	(revision 8408)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h	(revision 8409)
@@ -144,15 +144,15 @@
   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,7 +166,14 @@
   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,8 +206,14 @@
   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_L1S           = 13,
+  CODETYPEQZSS_L5_D          = 14,
+  CODETYPEQZSS_L5_P          = 15,
+  CODETYPEQZSS_L5_DP         = 16,
+  CODETYPEQZSS_L6E           = 17,
+  CODETYPEQZSS_L6_DE         = 18,
 
   CODETYPE_SBAS_L1_CA        = 0,
@@ -218,4 +231,10 @@
   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
 };