Index: firmware/App/HDCommon.h
===================================================================
diff -u -r21180e0b65fddfa27f66d8fb59cb55b2db304230 -r6c34ce9c95ba654ebb9f880bf35b7e8c594184f1
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 21180e0b65fddfa27f66d8fb59cb55b2db304230)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 6c34ce9c95ba654ebb9f880bf35b7e8c594184f1)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9033
+#define HD_VERSION_BUILD        9035
 
 // ********** development build switches **********
 
@@ -43,7 +43,7 @@
     #define DISABLE_AIR_TRAP_LEVELING       1           // Disable air trap level control
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
 //    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // After POST and homing, open all 4 valves
-    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
+//    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
 //    #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
@@ -54,30 +54,33 @@
     #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_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
-//    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
+    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
     #define DISABLE_CAL_CHECK               1           // Disable calibration checks
 //    #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 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 V1_5_SYSTEM                     1           // Build for v1.5 system
 //    #define V2_0_SYSTEM                     1           // Build for v2.0 system
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+//    #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 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
 
+
     #include <stdio.h>
     #include <strings.h>
 #endif