Index: firmware/App/HDCommon.h
===================================================================
diff -u -r838df450f09668adbd73e61fadbff8c81fe7926e -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 838df450f09668adbd73e61fadbff8c81fe7926e)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -32,26 +32,28 @@
 // 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 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
     #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_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
     #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_SALINE_BOLUS_CHECKS     1           // Do not error on HD saline bolus checks
+    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #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_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
@@ -62,7 +64,6 @@
 //    #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.