Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc7890e8beda1708d2dea0762dcc40ca5a12222e3 -r3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c7890e8beda1708d2dea0762dcc40ca5a12222e3)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045)
@@ -10,8 +10,8 @@
 * @author  (last)      Sean Nash
 * @date    (last)      12-Nov-2021
 *
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
+* @author  (original) Sean
+* @date    (original) 27-Feb-2020
 *
 ***************************************************************************/
 
@@ -24,8 +24,8 @@
 
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
-#define HD_VERSION_MICRO        5
-#define HD_VERSION_BUILD        25
+#define HD_VERSION_MICRO        0
+#define HD_VERSION_BUILD        115
 
 // ********** 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
@@ -59,8 +59,8 @@
     #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_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
@@ -79,6 +79,7 @@
     #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
 
     // Skip Pre-Treatment and get to treatment as soon as possible
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.