Index: firmware/App/DGCommon.h
===================================================================
diff -u -reeb4e9c7c8ca2bc41168353c3d30f311080972b2 -r31a5054c5a9a3c07ecfdced22fe25bb7ce4469cd
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision eeb4e9c7c8ca2bc41168353c3d30f311080972b2)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 31a5054c5a9a3c07ecfdced22fe25bb7ce4469cd)
@@ -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        94
 
 // ********** build switches **********
 
@@ -34,7 +34,7 @@
 // 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_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
     #define SKIP_CAL_CHECK               1
@@ -53,12 +53,13 @@
     #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  // Disabled for Tom
 //    #define DISABLE_MIXING                  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
+    //#define DISABLE_TRIMMER_HEATER 1
+    #define DIALYSATE_FLOW_METER_ENABLED    1
     #define DISABLE_ACK_ALARM 1
 
     #include <stdio.h>