Index: firmware/App/DGCommon.h
===================================================================
diff -u -raf0d774c41601d586be3ba02cfe6bf1ce19cd1f8 -r8defcfa32034c4068b733930c2e8b0989c55daba
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision af0d774c41601d586be3ba02cfe6bf1ce19cd1f8)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 8defcfa32034c4068b733930c2e8b0989c55daba)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 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
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      05-Jan-2022
 *
 * @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        17
+#define DG_VERSION_BUILD        18
 
 // ********** build switches **********
 
@@ -44,20 +44,20 @@
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 1
  //   #define IGNORE_DRAIN_PUMP_MONITOR       1
-//    #define IGNORE_HEATERS_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_COND_SENSOR_CHECK       1    // Disabled for Tom
+    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom
     #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_DIALYSATE_CHECK         1  // Disabled for Tom
+//    #define DISABLE_MIXING                  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
     #define DISABLE_ACK_ALARM 1