Index: firmware/App/DGCommon.h
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r4790fb46181f78a19f0a557b0e9688cc03a74e97
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 4790fb46181f78a19f0a557b0e9688cc03a74e97)
@@ -23,37 +23,40 @@
 // ********** 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        11
 
 // ********** 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 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 DISABLE_DIALYSATE_CHECK         1
     #define IGNORE_DRAIN_PUMP_MONITOR       1
-    #define IGNORE_HEATERS_MONITOR          1
-//    #define IGNORE_RO_PUMP_MONITOR          1
-    #define IGNORE_HEAT_DISINFECT_RSRVR_TIMEOUT 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_COND_SENSOR_CHECK       1
+//    #define DISABLE_WATER_QUALITY_CHECK     1
+    #define DISABLE_RTC_CONFIG              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_WATER_QUALITY_CHECK     1
+
     #include <stdio.h>
     #include <strings.h>
 #endif