Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r27a68f930508638f2eb6265ebb381c8918cbc37b
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
@@ -7,15 +7,16 @@
 *
 * @file    Switches.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Feb-2022
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  25-Jul-2021
 *
 ***************************************************************************/
 
 #include "FPGA.h"
+#include "NVDataMgmt.h"
 #include "Switches.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -128,6 +129,22 @@
         }
     }
 
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        // Clear active Alarms
+        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+        {
+            clearAlarmCondition( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        }
+
+        if ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) )
+        {
+            clearAlarmCondition( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+        }
+    }
+
     publishSwitchesData();
 }