Index: firmware/App/Common.h
===================================================================
diff -u -r197ee67d1cc0e0e3c80ccae58858dda09cad0834 -rca8cbd8a62d738848b4e512622e5a3d70c688173
--- firmware/App/Common.h	(.../Common.h)	(revision 197ee67d1cc0e0e3c80ccae58858dda09cad0834)
+++ firmware/App/Common.h	(.../Common.h)	(revision ca8cbd8a62d738848b4e512622e5a3d70c688173)
@@ -101,7 +101,10 @@
 #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 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; \