Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r8962d7d08d95e4eadedeacb7c04aad9bacbaa65f -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 8962d7d08d95e4eadedeacb7c04aad9bacbaa65f)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 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    Switches.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      19-Oct-2022
+* @author  (last)      Vinayakam Mani
+* @date    (last)      09-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  25-Jul-2021
@@ -142,7 +142,8 @@
                         // Log front door switch change
                         sendTreatmentLogEventData( FRONT_DOOR_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
                     }
-                    else if ( PUMP_TRACK_SWITCH == i )
+                    // removed explicit check due to VectorCast coverage
+                    else
                     {
                         // Log pump track switch change
                         sendTreatmentLogEventData( PUMP_TRACK_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
@@ -182,27 +183,28 @@
         {
             if ( getSwitchStatus( FRONT_DOOR ) != STATE_CLOSED )
             {
-                activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+                activateAlarmNoData( ALARM_ID_HD_CARTRIDGE_DOOR_OPENED );
             }
         }
         // Check for pump track unlocked alarm
         if ( TRUE == requirePumpTrackLocked )
         {
             if ( getSwitchStatus( PUMP_TRACK_SWITCH ) != STATE_CLOSED )
             {
-                activateAlarmNoData( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+                clearAlarmCondition( ALARM_ID_HD_PRE_TREATMENT_WET_PRIME_TEST_FAILURE );                    // Spurious bubble alarms occur when the cartridge is disturbed (unlatched)
+                activateAlarmNoData( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
             }
         }
 
         // Handle clearing alarm conditions
-        if ( ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) || ( requireDoorClosed != TRUE ) )
+        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
         {
-            clearAlarmCondition( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+            clearAlarmCondition( ALARM_ID_HD_CARTRIDGE_DOOR_OPENED );
         }
 
-        if ( ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ) || ( requirePumpTrackLocked != TRUE ) )
+        if ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) )
         {
-            clearAlarmCondition( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+            clearAlarmCondition( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
         }
     }
 }