Index: firmware/App/DGCommon.h
===================================================================
diff -u -r45891ce485a2f527a6278ee1b0cb49c1345fc2f2 -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 45891ce485a2f527a6278ee1b0cb49c1345fc2f2)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
@@ -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
 *
 ***************************************************************************/
 
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        14
+#define DG_VERSION_BUILD        16
 
 // ********** build switches **********
 
@@ -43,19 +43,23 @@
     #define ALARMS_DEBUG                    1
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 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_WATER_QUALITY_CHECK     1
     #define DISABLE_RTC_CONFIG              1
     #define THD_USING_TRO_CONNECTOR         1
+    #define DISABLE_FLOW_CHECK_IN_FILL      1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
+//    #define NEW_FMD_FLOW_SENSOR             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>