Index: firmware/App/DGCommon.h
===================================================================
diff -u -rfa8082956bc1d94cdd7b2375053a4f35e3159f43 -rbb053c804432b4c9dd0ed36f62a47bbfa39fa847
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision fa8082956bc1d94cdd7b2375053a4f35e3159f43)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision bb053c804432b4c9dd0ed36f62a47bbfa39fa847)
@@ -25,41 +25,43 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        18
+#define DG_VERSION_BUILD        130
 
 // ********** build switches **********
 
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
-//    #define BOARD_WITH_NO_HARDWARE          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 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 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    // 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
+//    #define BOARD_WITH_NO_HARDWARE          1            // Build switch
+//    #define TASK_TIMING_OUTPUT_ENABLED      1            // Build switch   // re-purposes drain pump enable pin for task timing
+//    #define DISABLE_HEATERS_AND_TEMPS       1            // Implement
+//    #define DISABLE_ACCELS                  1            // Implement
+//    #define SKIP_POST                       1            // Not needed
+    #define SKIP_CAL_CHECK               1                 // Implement
+//    #define ENABLE_DIP_SWITCHES             1            // Not needed
+//    #define EMC_TEST_BUILD                  1            // Build switch
+    #define ALARMS_DEBUG                    1              // Not needed
+//    #define HEATERS_DEBUG                   1            // Not needed
+//    #define PRESSURES_DEBUG                 1            // Not needed
+ //   #define IGNORE_DRAIN_PUMP_MONITOR       1            // Build switch
+    #define IGNORE_HEATERS_MONITOR          1              // Build switch
+    #define IGNORE_RO_PUMP_MONITOR          1              // Build switch
+    #define DISABLE_RO_RATIO_CHECK          1              // Implement
+    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom    // Implement
+    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom    // Implement
+    #define DISABLE_RTC_CONFIG              1              // Not needed
+    #define THD_USING_TRO_CONNECTOR         1              // Build switch
+    #define DISABLE_FLOW_CHECK_IN_FILL      1              // Implement
+    #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1          // Not needed
+//    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
+    #define DISABLE_HEATERS_EFFICIENCY      1
+    #define DISABLE_HEAT_DISINFECT_CONDUCTIVITY 1           // Implement
 
     // Turn these flags on to disable dialysate mixing
-    #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom
-//    #define DISABLE_MIXING                  1
-    //#define DISABLE_FLOW_CONTROL_TREATMENT  1
-    #define DISABLE_ACK_ALARM 1
+    #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom  // Implement
+//    #define DISABLE_MIXING                  1                     // Implement
+    //#define DISABLE_FLOW_CONTROL_TREATMENT  1                     // Not needed
+    #define DISABLE_ACK_ALARM 1                                     // Build switch
 
     #include <stdio.h>
     #include <strings.h>