Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r4ef47949b3e17f400efe794467bdef39ca79e4e0 -ra8bb1da29825b5d666333629fda871652d16229a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4ef47949b3e17f400efe794467bdef39ca79e4e0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a8bb1da29825b5d666333629fda871652d16229a)
@@ -31,11 +31,11 @@
 
 // ********** private definitions **********
 
-const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };        ///< A blank alarm data record for alarms that do not include alarm data when triggered.
+const ALARM_DATA_T BLANK_ALARM_DATA = { ALARM_DATA_TYPE_NONE, 0 };      ///< A blank alarm data record for alarms that do not include alarm data when triggered.
 
 // ********** private data **********
 
-static OVERRIDE_U32_T alarmIsActive[ NUM_OF_ALARM_IDS ];                ///< Array of current state of each alarm
+static BOOL 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 **********
@@ -56,11 +56,7 @@
     // initialize alarm states and start time stamps
     for ( alrm = ALARM_ID_NO_ALARM; alrm < NUM_OF_ALARM_IDS; alrm++ )
     {
-        alarmIsActive[ alrm ].data = FALSE;
-        alarmIsActive[ alrm ].ovData = FALSE;
-        alarmIsActive[ alrm ].ovInitData = TRUE;
-        alarmIsActive[ alrm ].override = OVERRIDE_RESET;
-
+        alarmIsActive[ alrm ] = FALSE;
         alarmConditionIsActive[ alrm ] = FALSE;
     }
 }
@@ -91,10 +87,10 @@
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
         // no need to do anything if alarm is already active
-        if ( FALSE == isAlarmActive( alarm ) )
+        if ( FALSE == alarmIsActive[ alarm ] )
         {
             // activate alarm
-            alarmIsActive[ alarm ].data = TRUE;
+            alarmIsActive[ alarm ] = TRUE;
             alarmConditionIsActive[ alarm ] = TRUE;
 
             // If alarm is a fault, request transition to fault mode
@@ -120,25 +116,8 @@
  * @return none
  *************************************************************************/
 void activateAlarmNoData( ALARM_ID_T alarm )
-{
-    // broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[ alarm ].data )
-    {
-        broadcastAlarmTriggered( alarm, blankAlarmData, blankAlarmData );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-        {
-            // TODO - temporary debug code - remove later
-            char debugStr[ 256 ];
-            sprintf( debugStr, "ALARM trig:%5d \n", alarm );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-        }
-#endif
-#endif
-    }
-
-    activateAlarm( alarm );
+{
+    activateAlarm2Data( alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
 }
 
 /*********************************************************************//**
@@ -153,25 +132,8 @@
  * @return none
  *************************************************************************/
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
-{
-    // broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[ alarm ].data )
-    {
-        broadcastAlarmTriggered( alarm, alarmData, blankAlarmData );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-        {
-            // TODO - temporary debug code - remove later
-            char debugStr[ 256 ];
-            sprintf( debugStr, "ALARM trig:%5d %8X \n", alarm, alarmData.data.uInt.data );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-        }
-#endif
-#endif
-    }
-
-    activateAlarm( alarm );
+{
+    activateAlarm2Data( alarm, alarmData, BLANK_ALARM_DATA );
 }
 
 /*********************************************************************//**
@@ -189,22 +151,10 @@
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 )
 {
     // broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[ alarm ].data )
+    if ( FALSE == alarmIsActive[ alarm ] )
     {
         broadcastAlarmTriggered( alarm, alarmData1, alarmData2 );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-        {
-            // TODO - temporary debug code - remove later
-            char debugStr[ 256 ];
-            sprintf( debugStr, "ALARM trig:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-        }
-#endif
-#endif
     }
-
     activateAlarm( alarm );
 }
 
@@ -223,22 +173,11 @@
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
         // clear alarm and broadcast alarm clear if not already cleared
-        if ( TRUE == alarmIsActive[ alarm ].data )
+        if ( TRUE == alarmIsActive[ alarm ] )
         {
             broadcastAlarmCleared( alarm );
-            alarmIsActive[ alarm ].data = FALSE;
+            alarmIsActive[ alarm ] = FALSE;
             clearAlarmCondition( alarm );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-            {
-                // TODO - temporary debug code - remove later
-                char debugStr[ 256 ];
-                sprintf( debugStr, "ALARM cleared:%5d \n", alarm );
-                sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                sendDebugDataToUI( (U08*)debugStr );
-            }
-#endif
-#endif
         }
     }
     else
@@ -284,24 +223,7 @@
  *************************************************************************/
 BOOL isAlarmActive( ALARM_ID_T alarm )
 {
-    BOOL result = TRUE;
-    if ( alarm < NUM_OF_ALARM_IDS )
-    {
-        if ( OVERRIDE_KEY == alarmIsActive[ alarm ].override )
-        {
-            result = (BOOL)alarmIsActive[ alarm ].ovData;
-        }
-        else
-        {
-            result = (BOOL)alarmIsActive[ alarm ].data;
-        }
-    }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
-    }
-
-    return result;
+    return alarmIsActive[ alarm ];
 }
 
 /*********************************************************************//**