Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10827)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10828)
@@ -184,4 +184,5 @@
   PhaseBiasType PBTYPE_SBAS;
   PhaseBiasType PBTYPE_BDS;
+  PhaseBiasType PBTYPE_RESERVED; // reserved for NavIC
   PhaseBiasType PBTYPE_AUTO;
 
@@ -193,4 +194,5 @@
   PhaseBiasExtType PBEXTTYPE_QZSS;
   PhaseBiasExtType PBEXTTYPE_BDS;
+  PhaseBiasExtType PBEXTTYPE_RESERVED; // reserved for NavIC
   PhaseBiasExtType PBEXTTYPE_AUTO;
 
@@ -198,6 +200,34 @@
   VtecType VTEC_BASE;
 
+  typedef unsigned int SatAntennaType;
+  SatAntennaType SATANTTYPE_BASE;
+  SatAntennaType SATANTTYPE_GPS;
+  SatAntennaType SATANTTYPE_GLONASS;
+  SatAntennaType SATANTTYPE_GALILEO;
+  SatAntennaType SATANTTYPE_QZSS;
+  SatAntennaType SATANTTYPE_BDS;
+  SatAntennaType SATANTTYPE_RESEVED; // reserved for NavIC
+  SatAntennaType SATANTTYPE_AUTO;
+
+  typedef unsigned int GridDefinitionType;
+  GridDefinitionType GRID_BASE;
+
+  typedef unsigned int TropoType;
+  TropoType TROPOTYPE_BASE;
+
+  typedef unsigned int RegionalIonoType;
+  RegionalIonoType REGIONOTYPE_BASE;
+  RegionalIonoType REGIONOTYPE_GPS;
+  RegionalIonoType REGIONOTYPE_GLONASS;
+  RegionalIonoType REGIONOTYPE_GALILEO;
+  RegionalIonoType REGIONOTYPE_QZSS;
+  RegionalIonoType REGIONOTYPE_BDS;
+  RegionalIonoType REGIONOTYPE_AUTO;
+
+  typedef unsigned int MetadataType;
+  MetadataType METADATATYPE_BASE;
+
   typedef unsigned int CodeType;
-  CodeType RESERVED;
+  CodeType CODETYPE_RESERVED;
   CodeType CODETYPE_GPS_L1_CA;
   CodeType CODETYPE_GPS_L1_P;
@@ -285,10 +315,14 @@
   CodeType CODETYPE_BDS_B2_Q;
   CodeType CODETYPE_BDS_B2_IQ;
-  CodeType CODETYPE_BDS_B1a_D;
+  CodeType CODETYPE_BDS_B1a_D; // B1a should be B1C
   CodeType CODETYPE_BDS_B1a_P;
   CodeType CODETYPE_BDS_B1a_DP;
+  CodeType CODETYPE_BDS_B1C_D;
+  CodeType CODETYPE_BDS_B1C_P;
+  CodeType CODETYPE_BDS_B1C_DP;
   CodeType CODETYPE_BDS_B2a_D;
   CodeType CODETYPE_BDS_B2a_P;
   CodeType CODETYPE_BDS_B2a_DP;
+  CodeType CODETYPE_BDS_B2b_D;
   CodeType CODETYPE_BDS_B1_A;
   CodeType CODETYPE_BDS_B3_A;
@@ -423,5 +457,5 @@
 #define T_IGS_SSR_VERSION(a)             ADDBITS( 3, a)      /*        IDF001 */
 #define T_IGS_MESSAGE_NUMBER(a)          ADDBITS( 8, a)      /*        IDF002 */
-#define T_SSR_EPOCH_TIME(a)              ADDBITS(20, a)      /* DF???  IDF003 */ //T_GPS_EPOCH_TIME(a)
+#define T_SSR_EPOCH_TIME(a)              ADDBITS(20, a)      /* DF385  IDF003 */ //T_GPS_EPOCH_TIME(a)
 #define T_GLONASS_EPOCH_TIME(a)          ADDBITS(17, a)      /* DF            */
 
@@ -465,5 +499,5 @@
 #define T_NO_OF_BIASES(a)                ADDBITS(5, a)                   /* DF, DF       IDF023 */ //_NO_OF_CODE_BIASES(a)T_NO_OF_PHASE_BIASES(a)
 
-#define T_GNSS_SIGNAL_IDENTIFIER(a)      ADDBITS(5, a)                   /* DF       IDF024 */
+#define T_GNSS_SIGNAL_IDENTIFIER(a)      ADDBITS(5, a)                   /* DF380, IDF024 */
 #define T_CODE_BIAS(a)                   SCALEADDBITS(14,      100.0, a) /* DF383, IDF025 */
 #define T_YAW_ANGLE(a)                   SCALEADDBITS( 9,  256.0/MPI, a) /* DF480, IDF026 */
@@ -565,8 +599,7 @@
 /* GNSS macros - Header part */
 #define G_RTCM_MESSAGE_NUMBER(a)         GETSSRBITS(a, 12)      /* DF002         */
-
+#define G_IGS_MESSAGE_NUMBER(a)          GETSSRBITS(a,  8)      /*        IDF002 */
 #define G_IGS_SSR_VERSION(a)             GETSSRBITS(a,  3)      /*        IDF001 */
-#define G_IGS_MESSAGE_NUMBER(a)          GETSSRBITS(a,  8)      /*        IDF002 */
-#define G_SSR_EPOCH_TIME(a)              GETSSRBITS(a, 20)      /*DF      IDF003 */
+#define G_SSR_EPOCH_TIME(a)              GETSSRBITS(a, 20)      /*DF385   IDF003 */
 #define G_SSR_EPOCH_TIME_CHECK(a, b)     {unsigned int temp; GETSSRBITS(temp, 20) \
  if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;}