Index: firmware/App/HDCommon.h
===================================================================
diff -u -rd270bdd420b6cab26851f3f195256b5c4b383d43 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d270bdd420b6cab26851f3f195256b5c4b383d43)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    HDCommon.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @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        30
 
 // ********** development build switches **********
 
@@ -49,14 +49,17 @@
 //    #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
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
-//    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
+    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
+    #define DISABLE_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range
+    #define DISABLE_VENOUS_PRESSURE_CHECK   1           // Do not error on venous pressure out of range
+
 //    #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
@@ -78,14 +81,19 @@
 //    #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 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>