Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
===================================================================
--- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10988)
+++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10989)
@@ -528,5 +528,5 @@
 #define T_NADIR_CORR_INDICATOR(a)                       ADDBITS(1,  a)  /* DF+019 (new RTCM) */
 #define T_NADIR_CORRECTION(a)                           ADDBITS(12, a)  /* DF+020 (new RTCM) */
-#define T_NADIR_ANGLE_DEPENDENT_CORRECTION(a)           SCALEADDBITS(3 + T_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a), 1000.0 a)  /* DF+021 (new RTCM)  NOT COMPLETED: can be extended up to 15/18 Bits*/
+#define T_NADIR_ANGLE_DEPENDENT_CORRECTION(a, nbits)    SCALEADDBITS(3 + nbits, 1000.0, a)  /* DF+021 (new RTCM)  can be extended up to 15/18 Bits from DF+015*/
 
 /* Grid Messages */
@@ -545,8 +545,10 @@
 #define T_GRID_STEP_SIZE_IN_LONGITUDE_DIRECTION(a)      SCALEADDBITS(10, 100.0, a)         /* DF+034 (new RTCM) */
 #define T_GRID_MASK_AVAILABILITY_FLAG(a)                ADDBITS(1,  a)                     /* DF+035 (new RTCM) */
-#define T_GRID_MASK_LATITUDE(a)                         ADDBITS(T_NUMBER_OF_POINTS_IN_LATITIDE_DIRECTION(a), a)
-#define T_GRID_MASK_LONGITUDE(a)                        ADDBITS(T_NUMBER_OF_POINTS_IN_LONGITUDE_DIRECTION(a), a) 
-
-
+#define T_GRID_MASK(a, nbits)                           ADDBITS(nbits, a)                  /* DF+036 (new RTCM) nbits from DF+031 or DF+032 */
+/*
+//Encoding
+#define T_NEW_PAR(a, nbits)        ADDBITS(nbits, a)               //called as T_NEW_PAR(co->NewPar, co->NewParNumBits)
+#define T_NEW_PAR_SCALE(a, nbits)  SCALEADDBITS(nbits, 10000.0, a) //called as T_NEW_PAR(co->NewPar, co->NewParNumBits)
+*/
 /* Ionosphere */
 #define T_NO_IONO_LAYERS(a)              ADDBITS(2, a-1)                 /* DF472, IDF035 */
@@ -710,6 +712,12 @@
 #define G_NADIR_CORR_INDICATOR(a)                       GETSSRBITS(a,  1)          /* DF+019 (new RTCM) */
 #define G_NADIR_CORRECTION(a)                           GETSSRBITS(a, 12)          /* DF+020 (new RTCM) */
-#define G_NADIR_ANGLE_DEPENDENT_CORRECTION(a)           GETSSRBITS(a,  3 + G_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a))          /* DF+021 (new RTCM) */
-  
+#define G_NADIR_ANGLE_DEPENDENT_CORRECTION(a)           GETSSRBITS(a,  3 + nbits)  /* DF+021 (new RTCM) can be extended up to 15/18 Bits from DF+015*/
+
+/*
+//Decoding
+#define G_NEW_PAR(a, nbits)        GETSSRBITS(a, nbits)            //called as G_NEW_PAR(co->NewPar, co->NewParNumBits)
+#define G_NEW_PAR_SCALE(a, nbits)  GETSSRFLOAT(a, nbits, 10000.0)  //called as G_NEW_PAR(co->NewPar, co->NewParNumBits)
+*/
+
 /* Ionosphere */
 #define G_NO_IONO_LAYERS(a) {unsigned int temp; GETSSRBITS(temp, 2) a = temp+1;} /* DF472, IDF035 */