Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r2fea76e972a450a97c74b2a9f627095032a3b586 -rac55f23681cd3a29ec235265f73c67895e36ada9
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2fea76e972a450a97c74b2a9f627095032a3b586)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ac55f23681cd3a29ec235265f73c67895e36ada9)
@@ -33,7 +33,8 @@
 
 // ********** private data **********
 
-static OVERRIDE_U32_T alarmIsActive[ NUM_OF_ALARM_IDS ];                ///< Array of current state of each alarm
+static OVERRIDE_U32_T alarmIsActive[ NUM_OF_ALARM_IDS ];                ///< Array of current state of each alarm
+static BOOL alarmConditionIsActive[ NUM_OF_ALARM_IDS ];                 ///< Array of flag indicates if an alarm condition is active
 
 // ********** private function prototypes **********
 
@@ -57,7 +58,9 @@
         alarmIsActive[ a ].data = FALSE;
         alarmIsActive[ a ].ovData = FALSE;
         alarmIsActive[ a ].ovInitData = TRUE;
-        alarmIsActive[ a ].override = OVERRIDE_RESET;
+        alarmIsActive[ a ].override = OVERRIDE_RESET;
+
+        alarmConditionIsActive[ a ] = FALSE;
     }
 }
 
@@ -90,7 +93,8 @@
         if ( FALSE == getAlarmActive( alarm ) )
         {
             // activate alarm
-            alarmIsActive[ alarm ].data = TRUE;
+            alarmIsActive[ alarm ].data = TRUE;
+            alarmConditionIsActive[ alarm ] = TRUE;
         }
     }
     else
@@ -113,7 +117,7 @@
     // broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
-        broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
+        broadcastAlarmTriggered( alarm, blankAlarmData, blankAlarmData );
 #ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
         {
@@ -146,7 +150,7 @@
     // broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
-        broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
+        broadcastAlarmTriggered( alarm, alarmData, blankAlarmData );
 #ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
         {
@@ -180,7 +184,7 @@
     // broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
-        broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
+        broadcastAlarmTriggered( alarm, alarmData1, alarmData2 );
 #ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
         {
@@ -235,6 +239,33 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The clearAlarmCondition function clears a given alarm's condition detected
+ * flag. Also an alarm message is broadcast to the rest of the system.
+ * @details Inputs: none
+ * @details Outputs: alarmConditionIsActive[]
+ * @param alarm ID of alarm to clear condition for
+ * @return none
+ *************************************************************************/
+void clearAlarmCondition( ALARM_ID_T alarm )
+{
+    // verify given alarm
+    if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
+    {
+        // clear alarm and broadcast alarm clear if not already cleared
+        if ( TRUE == alarmConditionIsActive[ alarm ] )
+        {
+            broadcastAlarmConditionCleared( alarm );
+            alarmConditionIsActive[ alarm ] = FALSE;
+        }
+    }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
+    }
+}
+
 /*********************************************************************//**
  * @brief
  * The isAlarmActive function determines whether a given alarm is currently active.