Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp	(revision 8617)
+++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp	(revision 8629)
@@ -713,15 +713,12 @@
       case CODETYPEGLONASS_L1_CA:     return "1C";
       case CODETYPEGLONASS_L1_P:      return "1P";
-
-      case CODETYPEGLONASS_L1a_OCd:   return "1A";
-      case CODETYPEGLONASS_L1a_OCp:   return "1B";
-      case CODETYPEGLONASS_L1a_OCdp:  return "1X";
-
       case CODETYPEGLONASS_L2_CA:     return "2C";
       case CODETYPEGLONASS_L2_P:      return "2P";
-      case CODETYPEGLONASS_L2a_CSI:   return "1A";
-      case CODETYPEGLONASS_L2a_OCp:   return "1B";
-      case CODETYPEGLONASS_L2a_CSIOCp:return "1X";
-
+      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";
@@ -763,19 +760,20 @@
       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";
       case CODETYPEQZSS_L2C_ML:        return "2X";
-
       case CODETYPEQZSS_L5_I:          return "5I";
       case CODETYPEQZSS_L5_Q:          return "5Q";
       case CODETYPEQZSS_L5_IQ:         return "5X";
-
       case CODETYPEQZSS_L6_D:          return "6S";
       case CODETYPEQZSS_L6_P:          return "6L";
       case CODETYPEQZSS_L6_DP:         return "6X";
-      case CODETYPEQZSS_L6E:           return "6E";
-
+      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 "";
     }
@@ -796,12 +794,16 @@
       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 "";
     }
Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h	(revision 8617)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h	(revision 8629)
@@ -210,9 +210,9 @@
   CODETYPEQZSS_L6_DP         = 11,
   CODETYPEQZSS_L1C_DP        = 12,
-  CODETYPEQZSS_L1S           = 13,
+  CODETYPEQZSS_L1_S          = 13,
   CODETYPEQZSS_L5_D          = 14,
   CODETYPEQZSS_L5_P          = 15,
   CODETYPEQZSS_L5_DP         = 16,
-  CODETYPEQZSS_L6E           = 17,
+  CODETYPEQZSS_L6_E          = 17,
   CODETYPEQZSS_L6_DE         = 18,