Index: firmware/App/Common.h
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r9864b14f76782f1e68bf266dcd843451748715a0
--- firmware/App/Common.h	(.../Common.h)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Common.h	(.../Common.h)	(revision 9864b14f76782f1e68bf266dcd843451748715a0)
@@ -23,6 +23,7 @@
 
 #ifndef _VECTORCAST_
 //    #define RM46_EVAL_BOARD_TARGET      1
+    #define ACK_IMPLEMENTED             1
 //    #define SIMULATE_UI                 1
     #define DEBUG_ENABLED               1
 
@@ -95,8 +96,8 @@
 #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 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))