Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -re2cf7feff54dad3fc5be72619fa64b5421fc6f9f
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e2cf7feff54dad3fc5be72619fa64b5421fc6f9f)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmt.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      09-Aug-2023
+* @author  (last)      Vinayakam Mani
+* @date    (last)      11-Sep-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
@@ -82,7 +82,7 @@
 } ALARM_PRIORITY_RANKS_T;
 
 /// Enumeration of alarm audio self-test states.
-typedef enum Alarm_Lamp_Self_Test_States
+typedef enum Alarm_Audio_Self_Test_States
 {
     ALARM_AUDIO_SELF_TEST_STATE_START = 0,      ///< Start state of alarm audio self-test.
     ALARM_AUDIO_SELF_TEST_STATE_PRIMARY,        ///< Test tone state of alarm audio self-test.
@@ -120,16 +120,18 @@
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
+
 /// Interval (in task intervals) at which to publish alarm information to CAN bus.
 static OVERRIDE_U32_T alarmInfoPublishInterval = { ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, 0 };
+
 /// Alarm audio attenuation level (0..4 where 0 = max volume and 4 = min volume).
 static OVERRIDE_U32_T alarmAudioVolumeLevel = { MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, 0 };
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (high gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (high gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (low gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (low gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               /// Alarm backup audio current measured at ADC.
+static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               ///< Alarm backup audio current measured at ADC.
 
 static COMP_ALARM_STATUS_T alarmStatus;                                             ///< Record for the current composite alarm status.
 static ALARM_PRIORITY_RANKS_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];         ///< FIFO - first activated or highest sub-rank alarm in each alarm priority category.
@@ -1733,7 +1735,7 @@
  * the correct 32-bit key.  A Dialin user must also be logged into HD.
  * @details Inputs: none
  * @details Outputs: alarmIsActive[], alarmStartedAt[]
- * @param key 32-bit supervior alarm key required to perform this function
+ * @param key 32-bit supervisor alarm key required to perform this function
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testClearAllAlarms( U32 key )
@@ -1748,6 +1750,10 @@
         {
             ALARM_ID_T a;
 
+            // clear the flags when Dialin clears alarms
+            alarmNoRetrigger             = FALSE;
+            resumeBlockedByAlarmProperty = FALSE;
+
             // Clear all active alarms
             for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
             {