Index: firmware/App/HDCommon.h
===================================================================
diff -u -r494828bba7e66a82f498a0fee6f370e387f99fb9 -rdd1a9a6f5e43a5da27f4d51f56388f7d019cc43d
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 494828bba7e66a82f498a0fee6f370e387f99fb9)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision dd1a9a6f5e43a5da27f4d51f56388f7d019cc43d)
@@ -10,8 +10,8 @@
 * @author  (last)      Dara Navaei
 * @date    (last)      04-Jan-2022
 *
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
+* @author  (original) Sean
+* @date    (original) 27-Feb-2020
 *
 ***************************************************************************/
 
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        31
+#define HD_VERSION_BUILD        154
 
 // ********** development build switches **********
 
@@ -49,7 +49,7 @@
 //    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
 //    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
     #define WORN_OUT_CARTRIDGE              1           // Running with an old worn out cartridge (max wear)
-//    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor
+    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor
     #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
@@ -62,8 +62,8 @@
 
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
-//    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
-    #define SKIP_CAL_CHECK               1
+    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
+    #define SKIP_CAL_CHECK                  1           //
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #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
@@ -78,23 +78,25 @@
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
 //    #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
-//    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
+    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 //    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
     #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
     #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm
     #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
-    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test
+//    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
+//    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test
     #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
     #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_PRIMING                    1           // Skip Pre-treatment Prime
-//    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 
+
     #include <stdio.h>
     #include <strings.h>
 #endif