Index: firmware/App/HDCommon.h
===================================================================
diff -u -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
@@ -23,7 +23,7 @@
 // ********** version **********
 
 #define HD_VERSION_MAJOR        0
-#define HD_VERSION_MINOR        5
+#define HD_VERSION_MINOR        6
 #define HD_VERSION_MICRO        0
 #define HD_VERSION_BUILD        9037
 
@@ -37,9 +37,9 @@
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
-//    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
-//    #define SKIP_POST                       1           // Skip POST tests - all pass
-//    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
+    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
+    #define SKIP_POST                       1           // Skip POST tests - all pass
+    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
 //    #define USE_LIBRARY_TIME_FUNCTIONS      1           // Use the C library functions mktime() and gmtime() for epoch<=>date conversions
     #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
@@ -57,25 +57,19 @@
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
     #define DISABLE_CAL_CHECK               1           // Disable calibration checks
+    #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define RAW_FLOW_SENSOR_DATA            1           // Test build will not filter flow sensor data
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
 //    #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V2_0_SYSTEM                     1           // Build for v2.0 system
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
-    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
-    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
-//    #define DISABLE_BATT_COMM               1           // Disable battery communication.
+    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
 //    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
-    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
@@ -84,6 +78,14 @@
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
+    // Skip Pre-Treatment and get to treatment as soon as possible
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+
     #include <stdio.h>
     #include <strings.h>
 #endif