Index: firmware/App/DGCommon.h
===================================================================
diff -u -r81cd7f8794002173ba1b8bb886d33a03ce3c6f83 -r6225c12de69db32e83c9d1f55fbabca3e7e32a3a
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 81cd7f8794002173ba1b8bb886d33a03ce3c6f83)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 6225c12de69db32e83c9d1f55fbabca3e7e32a3a)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file DGCommon.h
+* @file    DGCommon.h
 *
-* @author (last) Sean Nash
-* @date (last) 04-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Nov-2021
 *
-* @author (original) Sean
-* @date (original) 27-Feb-2020
+* @author  (original)  Sean
+* @date    (original)  27-Feb-2020
 *
 ***************************************************************************/
 
@@ -23,41 +23,42 @@
 // ********** version **********
 
 #define DG_VERSION_MAJOR        0
-#define DG_VERSION_MINOR        5
+#define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        15
+#define DG_VERSION_BUILD        16
 
 // ********** build switches **********
 
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
-    #define DONT_SKIP_NV_POST               1
-//    #define SIMULATE_UI                     1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
 //    #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
-    #define DISABLE_CAL_CHECK               1
+    #define SKIP_CAL_CHECK               1
 //    #define ENABLE_DIP_SWITCHES             1
 //    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 1
-    #define DISABLE_DIALYSATE_CHECK         1
-//    #define IGNORE_DRAIN_PUMP_MONITOR       1
+ //   #define IGNORE_DRAIN_PUMP_MONITOR       1
 //    #define IGNORE_HEATERS_MONITOR          1
     #define IGNORE_RO_PUMP_MONITOR          1
-//    #define DISABLE_RO_RATIO_CHECK          1
-    #define DISABLE_COND_SENSOR_CHECK       1
-    #define DISABLE_MIXING                  1
-    #define DISABLE_WATER_QUALITY_CHECK     1
+    #define DISABLE_RO_RATIO_CHECK          1
+//    #define DISABLE_COND_SENSOR_CHECK       1
+//    #define DISABLE_WATER_QUALITY_CHECK     1
     #define DISABLE_RTC_CONFIG              1
-    //#define V_2_SYSTEM                      1
-    //#define SKIP_RECIRC                     1
     #define THD_USING_TRO_CONNECTOR         1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
+
+    // Turn these flags on to disable dialysate mixing
+    #define DISABLE_DIALYSATE_CHECK         1
+    #define DISABLE_MIXING                  1
+    //#define DISABLE_FLOW_CONTROL_TREATMENT  1
+    #define DISABLE_ACK_ALARM 1
+
     #include <stdio.h>
     #include <strings.h>
 #endif