Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra97fcffbe7b7b2d9543358ac06868829d41cf173 -r1467e388082a0d4c9e4b7e03b689a70ba42862db
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a97fcffbe7b7b2d9543358ac06868829d41cf173)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1467e388082a0d4c9e4b7e03b689a70ba42862db)
@@ -25,20 +25,21 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        0
+#define HD_VERSION_BUILD        9035
 
 // ********** development build switches **********
 
 // TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
-//    #define BOARD_WITH_NO_HARDWARE          1
+//    #define USING_DEBUGGER                  1           // Want to be able to use the debugger and have break points
+//    #define BOARD_WITH_NO_HARDWARE          1           // Target is a PCB w/ no hardware
 //    #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
+//    #define SKIP_POST                       1           // Skip POST tests - all pass
+//    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
     #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
@@ -49,19 +50,23 @@
     #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_SYRINGE_PUMP            1           // Disable syringe pump functionality
+//    #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_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
+    #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 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_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
@@ -71,6 +76,7 @@
     #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
 
 
     #include <stdio.h>