Index: firmware/App/Common.h
===================================================================
diff -u -rd71d1e6c2be627158cac9a8bc56adac7cdefd1c8 -ref0b3f0ec00fadc50f95e0db1a6477fb4b076ea1
--- firmware/App/Common.h	(.../Common.h)	(revision d71d1e6c2be627158cac9a8bc56adac7cdefd1c8)
+++ firmware/App/Common.h	(.../Common.h)	(revision ef0b3f0ec00fadc50f95e0db1a6477fb4b076ea1)
@@ -86,12 +86,16 @@
 #define SHIFT_16_BITS_FOR_WORD_SHIFT    16
 #define FLOAT_TO_INT_ROUNDUP_OFFSET     0.5
 #define ML_PER_LITER                    1000
+#define MS_PER_SECOND                   1000
+#define SEC_PER_MIN                     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 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 INC_CAP(v, u)                   ((v) == (u) ? (u) : ((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))