Index: firmware/App/HDCommon.h
===================================================================
diff -u -r778f343622819491cf644dab36f3194709ce1e95 -r27f3db92495948d4c1192421c1b0c20338c4a034
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 778f343622819491cf644dab36f3194709ce1e95)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
@@ -41,23 +41,25 @@
     #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_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_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
+//    #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_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 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 V1_5_SYSTEM                     1           // Build for v1.5 system
+    #define SKIP_SELF_TESTS                 1           // Skip Pre-treatment Self-tests
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+//    #define V1_5_SYSTEM                     1           // Build for v1.5 system
 
     #include <stdio.h>
     #include <strings.h>