Index: firmware/App/HDCommon.h
===================================================================
diff -u -r8f799f87cfdc5ecfb74ea6a55b5493512767214f -r5577d7fcbf40b3e188174328143369c84c2e68b1
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8f799f87cfdc5ecfb74ea6a55b5493512767214f)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 5577d7fcbf40b3e188174328143369c84c2e68b1)
@@ -63,26 +63,27 @@
 //    #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 TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
 //    #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 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
 
+    // 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