Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6f0304ba16597df68b05fb2af2d1a45b6c43b0ca -r49182b162048845906ddf1274a88d4a74998baf1
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6f0304ba16597df68b05fb2af2d1a45b6c43b0ca)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 49182b162048845906ddf1274a88d4a74998baf1)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      31-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      05-Apr-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -1012,7 +1012,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+            activateAlarmNoData( ALARM_ID_HD_INSTALL_NEW_CARTRIDGE );
         }
 #ifndef _RELEASE_
         else
@@ -1098,7 +1098,7 @@
                     // Check to see if sensor is within normal ranges before we execute pressure sensor tests
                     if ( ( fabs( previousNormalArterialPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) || ( fabs( previousNormalVenousPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) )
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
                     }
                 }
             }
@@ -1114,7 +1114,7 @@
                 // Check to see if sensor is within normal ranges before we execute pressure sensor tests
                 if ( ( fabs( previousNormalArterialPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) || ( fabs( previousNormalVenousPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
                 }
                 else
                 {
@@ -1214,12 +1214,13 @@
 
     if ( TRUE == didTimeout( pressureSelfTestVenousTestStartTime, VENOUS_PRESSURE_SELF_TEST_MAX_TEST_TIME ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG );
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG );
         setAirPumpState( AIR_PUMP_STATE_OFF );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
+        setAirPumpState( AIR_PUMP_STATE_OFF );
         state = DRY_SELF_TESTS_STOPPED_STATE;
         setupForSelfTestsStop();
     }
@@ -1287,7 +1288,7 @@
 
     if ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, arterialPressure );
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, arterialPressure );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -1346,7 +1347,7 @@
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialDecayDiff, venousDecayDiff );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialDecayDiff, venousDecayDiff );
         }
     }
 
@@ -1389,7 +1390,7 @@
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialStabilityDiff, venousStabilityDiff );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialStabilityDiff, venousStabilityDiff );
         }
     }
 
@@ -1452,7 +1453,7 @@
     // If pressures do not normalize within max t/o, alarm
     if ( TRUE == didTimeout( pressureSelfTestNormalizedStartTime, NORMALIZED_PRESSURE_SELF_TEST_TIME ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE, arterialPressureDiff, venousPressureDiff );
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE, arterialPressureDiff, venousPressureDiff );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -1548,8 +1549,6 @@
     {
         if ( FALSE == checkForPrimeOcclusion() )  // transition to complete state only when occlusion is removed
         {
-            // clear the occlusion alarm condition to allow user to resume
-            clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION );  // Resume option will appear
             state = DRY_SELF_TESTS_COMPLETE_STATE;
         }
     }
@@ -1729,7 +1728,7 @@
         else
         {
 #ifndef _RELEASE_
-            if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE ) )
+            if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) ) )
             {
                 state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
             }
@@ -1742,7 +1741,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_PRE_TREATMENT_WET_PRIME_TEST_FAILURE );
+        activateAlarmNoData( ALARM_ID_HD_PRE_TREATMENT_WET_PRIME_TEST_FAILURE );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -1910,11 +1909,11 @@
     {
         if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, averageDisp, fmdIntegratedVolume );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, averageDisp, fmdIntegratedVolume );
         }
     }
 
@@ -2053,11 +2052,11 @@
     {
         if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, avgDisp, fmdIntegratedVolume );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, avgDisp, fmdIntegratedVolume );
         }
     }