Index: firmware/App/Common.h
===================================================================
diff -u -r620033425435de1fab63396301aa2404a49f8777 -r67f098b686392525319cd8766c38af935adfbbe5
--- firmware/App/Common.h	(.../Common.h)	(revision 620033425435de1fab63396301aa2404a49f8777)
+++ firmware/App/Common.h	(.../Common.h)	(revision 67f098b686392525319cd8766c38af935adfbbe5)
@@ -22,9 +22,9 @@
 // ********** build switches **********
 
 #ifndef _VECTORCAST_
-//    #define RM46_EVAL_BOARD_TARGET      1
+    #define RM46_EVAL_BOARD_TARGET      1
 //    #define SIMULATE_UI                 1
-    #define DEBUG_ENABLED               1
+//    #define DEBUG_ENABLED               1
 
     #ifdef DEBUG_ENABLED
         #include <stdio.h>
@@ -89,10 +89,14 @@
 #define MS_PER_SECOND                   1000
 #define SEC_PER_MIN                     60
 #define FRACTION_TO_PERCENT_FACTOR      100.0
+#define ZERO                            0
+#define MIN_PER_HOUR                    60
 
+
 // **** Common Macros ****
 
 #define FLOAT_TO_INT_WITH_ROUND(f)      ((f) < 0.0 ? (S32)((f) - FLOAT_TO_INT_ROUNDUP_OFFSET) : (S32)((f) + FLOAT_TO_INT_ROUNDUP_OFFSET))
+#define FLOAT_TO_INT(f)                 ((S32)((f) + FLOAT_TO_INT_ROUNDUP_OFFSET))
 #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))
@@ -107,7 +111,11 @@
 #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 BIT_BY_POS(p)                   (1U << (p))
+#define CIRCULAR_INCREASE(i, i_max)     (( (++i) == i_max) ? 0 : i )
+#define CIRCULAR_DECREASE(i, i_max)     (( ((S16) --i) == -1) ? i_max-1 : i )
 
+
+
 #define SET_ALARM_WITH_1_U32_DATA(a,d1)   { \
     ALARM_DATA_T dat1; \
     dat1.dataType = ALARM_DATA_TYPE_U32; \