Index: firmware/App/HDCommon.h
===================================================================
diff -u -rd27dcf1fbbc9651636f211028917a1c0702bb56a -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d27dcf1fbbc9651636f211028917a1c0702bb56a)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -23,9 +23,9 @@
 // ********** version **********
 
 #define HD_VERSION_MAJOR        0
-#define HD_VERSION_MINOR        5
-#define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9037
+#define HD_VERSION_MINOR        6
+#define HD_VERSION_MICRO        5
+#define HD_VERSION_BUILD        16
 
 // ********** development build switches **********
 
@@ -50,39 +50,39 @@
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
 //    #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
 //    #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
-    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
+//    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
-//    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
+    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #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_VALVE_ALARMS            1           // Do not error on HD valve position
+    #define SKIP_CAL_CHECK               1
 //    #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 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
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
-    #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
+//    #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