Index: firmware/App/Common.h
===================================================================
diff -u -r620104f4a9e3148575703981a3063b9605b6e9b8 -r941afbaab7fc86f40fa49f9d110d481f65b44b68
--- firmware/App/Common.h	(.../Common.h)	(revision 620104f4a9e3148575703981a3063b9605b6e9b8)
+++ firmware/App/Common.h	(.../Common.h)	(revision 941afbaab7fc86f40fa49f9d110d481f65b44b68)
@@ -88,18 +88,18 @@
 
 // **** Common Macros ****
 
-#define CAP(v,u)                        ((v) > (u) ? (u) : (v))
-#define RANGE(v,l,u)                    ((v) > (u) ? (u) : ((v) < (l) ? (l) : (v)))
-#define INC_WRAP(v,l,u)                 ((v) == (u) ? (l) : ((v)+1))
-#define MAX(a,b)                        ((a) < (b) ? (b) : (a))
-#define MIN(a,b)                        ((a) > (b) ? (b) : (a))
+#define CAP(v, u)                       ((v) > (u) ? (u) : (v))
+#define RANGE(v, l, u)                  ((v) > (u) ? (u) : ((v) < (l) ? (l) : (v)))
+#define INC_WRAP(v, l, u)               ((v) == (u) ? (l) : ((v) + 1))
+#define MAX(a, b)                       ((a) < (b) ? (b) : (a))
+#define MIN(a, b)                       ((a) > (b) ? (b) : (a))
 #define GET_LSB_OF_WORD(w)              ((U08)((w) & MASK_OFF_MSB))
 #define GET_MSB_OF_WORD(w)              ((U08)(((w) >> SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_MSB))
 #define GET_LSW_OF_LONG(l)              ((U16)((l) & MASK_OFF_MSW))
 #define GET_MSW_OF_LONG(l)              ((U16)(((l) >> SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_MSW))
-#define MAKE_WORD_OF_BYTES(h,l)         ((((U16)(h) << SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))
-#define MAKE_LONG_OF_WORDS(h,l)         ((((U32)(h) << SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
-#define GET_TOGGLE(v,l,h)               ((v) == (l) ? (h) : (l))
+#define MAKE_WORD_OF_BYTES(h, l)        ((((U16)(h) << SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))
+#define MAKE_LONG_OF_WORDS(h, l)        ((((U32)(h) << SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
+#define GET_TOGGLE(v, l, h)             ((v) == (l) ? (h) : (l))
 
 #define SET_ALARM_WITH_1_U32_DATA(a,d1)   { \
     ALARM_DATA_T dat1; \