Index: firmware/App/HDCommon.h
===================================================================
diff -u -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4 -r240e23ebbb15f0ecb1bd7415b1a07c805f2f46e9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 240e23ebbb15f0ecb1bd7415b1a07c805f2f46e9)
@@ -25,19 +25,20 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        0
+#define HD_VERSION_BUILD        9005
 
 // ********** development build switches **********
 
 // TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
+//    #define BOARD_WITH_NO_HARDWARE          1
 //    #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 LIMITED_NVDATA_CRC_CHECKS       1           // Only perform POST CRC checks on nv-data records that are implemented so far
+//    #define SKIP_POST                       1           // Skip POST tests - all pass
+//    #define DONT_SKIP_NV_POST               1
     #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
@@ -52,22 +53,23 @@
     #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 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 SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
-    #define SKIP_CALIBRATION_TESTS          1           // Skip calibration tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
     #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
-    #define SKIP_CALIBRATION_TESTS          1           // Skip pre-treatment self-tests involving calibration
     #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
 
     #include <stdio.h>
     #include <strings.h>