Index: firmware/App/HDCommon.h
===================================================================
diff -u -r6016d93dedc30f1fb115dc7467c88399512f459f -r8a4a90c6ab504b8067d1d5e8454cd947850b9ab9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 6016d93dedc30f1fb115dc7467c88399512f459f)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8a4a90c6ab504b8067d1d5e8454cd947850b9ab9)
@@ -10,8 +10,8 @@
 * @author  (last)      Dara Navaei
 * @date    (last)      23-May-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        47
+#define HD_VERSION_BUILD        322
 
 // ********** development build switches **********
 
@@ -42,13 +42,13 @@
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
-      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
-//      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
+//      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
+      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
       // TODO stays as a build switch until the calibration structure is updated with the build
-      #define SKIP_CAL_CHECK                  1           // Implement software configuration
+      #define SKIP_CAL_CHECK                  1           // Implement software configuration once the build switch is done
 
-    #include <stdio.h>
+#include <stdio.h>
     #include <strings.h>
 #endif
 #endif
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6016d93dedc30f1fb115dc7467c88399512f459f -r8a4a90c6ab504b8067d1d5e8454cd947850b9ab9
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6016d93dedc30f1fb115dc7467c88399512f459f)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8a4a90c6ab504b8067d1d5e8454cd947850b9ab9)
@@ -41,7 +41,7 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
@@ -326,7 +326,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -878,16 +878,19 @@
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
+
+    SEND_EVENT_WITH_2_U32_DATA(HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,(U32)ADVBubbleStatus,(U32)BUBBLE_DETECTED)
+
     if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -1030,8 +1033,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
-                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1426,6 +1429,9 @@
         }
 #endif
 
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, resOneDiffAfterDisplacement,resOneDiffAfterDisplacement )
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, integratedVolumeDiff,WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE )
+
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
                ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )
@@ -1561,6 +1567,10 @@
             integrateVolumeToleranceG = 50.0F;
         }
 #endif
+
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, resOneDiffAfterDisplacement, resOneDiffAfterDisplacement )
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, integratedVolumeToTargetPercent, WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE )
+
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
                ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )