Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r2a3a47ca90ad19851a30c52f6999a56d5f578783 -rf6b78d1fe6741043de38707211710ab0e8a08483
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-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    SelfTests.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Hung Nguyen
+* @date    (last)      15-Feb-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -41,6 +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 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.
@@ -62,8 +63,9 @@
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
-#define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                       ///< Maximum no cartridge self-test time (in seconds).
+#define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                      ///< Maximum no cartridge self-test time (in seconds).
 #define MAX_DRY_SELF_TEST_TIME                              ( 3 * SEC_PER_MIN )                     ///< Maximum dry self-test time (in seconds).
+#define CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS            ( 10 * MS_PER_SECOND )                  ///< Time (in ms) required to wait for occlusion pressure to settle after cartridge insertion.
 
 #define SELF_TEST_TIME_DATA_PUB_INTERVAL                    ( MS_PER_SECOND )                       ///< Interval (ms/task time) at which self-test time data is published on the CAN bus.
 
@@ -112,6 +114,7 @@
 
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
 static U32 selfTestPreviousPublishDataTime;                         ///< Last time self-test time data is being published (in ms).
+static U32 syringeOcclusionDelayStartTime;                          ///< Used to calculate the 1 second delay time before check for prime occlusion.
 
 static BOOL useHeparin;                                             ///< Flag indicates the user of heparin.
 
@@ -135,6 +138,7 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( SELF_TEST_STATUS_T *result );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsNormalState( SELF_TEST_STATUS_T *result );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpPrimeState( void );
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpOcclusionDetectionState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestStoppedState( void );
 
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStartState( void );
@@ -161,6 +165,7 @@
 {
     selfTestStartTime = 0;
     selfTestPreviousPublishDataTime = 0;
+    syringeOcclusionDelayStartTime = 0;
 }
 
 /*********************************************************************//**
@@ -201,7 +206,16 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
-    stopSyringePump();
+
+    if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+    {
+        retractSyringePump();
+    }
+    else
+    {
+        stopSyringePump();
+    }
+
     setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
@@ -429,6 +443,10 @@
             currentDrySelfTestsState = handleDrySelfTestSyringePumpPrimeState();
             break;
 
+        case DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE:
+            currentDrySelfTestsState = handleDrySelfTestSyringePumpOcclusionDetectionState();
+            break;
+
         case DRY_SELF_TESTS_STOPPED_STATE:
             currentDrySelfTestsState = handleDrySelfTestStoppedState();
             break;
@@ -1022,6 +1040,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleDrySelfTestSyringePumpOcclusionDetectionState function handles
+ * occlusion detection after prime has completed.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return the next state of dry self-tests state machine
+ *************************************************************************/
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpOcclusionDetectionState( void )
+{
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
+
+    if ( TRUE == didTimeout( syringeOcclusionDelayStartTime, SYRINGE_PUMP_OCCLUSION_CHECK_DELAY ) )
+    {
+        checkForPrimeOcclusion();
+        state = DRY_SELF_TESTS_COMPLETE_STATE;
+    }
+
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        state = DRY_SELF_TESTS_STOPPED_STATE;
+        setupForSelfTestsStop();
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDrySelfTestStoppedState function handles the stopped dry self-tests
  * operation.
  * @details Inputs: none
@@ -1090,8 +1135,16 @@
 
         if ( FALSE == cmdResp.rejected )
         {
+            F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SETUP_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
             fmdIntegratedVolume = 0.0;
+
+            if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+            {
+                startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
+            }
+
             state = WET_SELF_TESTS_SETUP_STATE;
         }
     }