Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r941afbaab7fc86f40fa49f9d110d481f65b44b68 -r1bbf9da32e622975efed00b1a7589387a9829440
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 941afbaab7fc86f40fa49f9d110d481f65b44b68)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1bbf9da32e622975efed00b1a7589387a9829440)
@@ -44,7 +44,7 @@
 } ALARM_T;
 #pragma pack(pop)
 
-const ALARM_T alarmTable[NUM_OF_ALARM_IDS] =
+const ALARM_T alarmTable[ NUM_OF_ALARM_IDS ] =
 { //     Priority           Esc    Escalate To     Fault  Stops  NoClr  NoRes  NoRin  NoEnd  NoNew  Bypass
     { ALARM_PRIORITY_NONE,   0, ALARM_ID_NO_ALARM, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NO_ALARM
     { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_SOFTWARE_FAULT
@@ -71,7 +71,7 @@
 
 static COMP_ALARM_STATUS_T alarmStatus;
 
-static ALARM_ID_T alarmPriorityFIFO[NUM_OF_ALARM_PRIORITIES];
+static ALARM_ID_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];
 
 // ********** private function prototypes **********
 
@@ -106,19 +106,19 @@
     // initialize alarm states and start time stamps
     for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
     {
-        alarmIsActive[a].data = FALSE;
-        alarmIsActive[a].ovData = FALSE;
-        alarmIsActive[a].ovInitData = TRUE;
-        alarmIsActive[a].override = OVERRIDE_RESET;
-        alarmStartedAt[a].data = 0;
-        alarmStartedAt[a].ovData = 0;
-        alarmStartedAt[a].ovInitData = 0;
-        alarmStartedAt[a].override = OVERRIDE_RESET;
+        alarmIsActive[ a ].data = FALSE;
+        alarmIsActive[ a ].ovData = FALSE;
+        alarmIsActive[ a ].ovInitData = TRUE;
+        alarmIsActive[ a ].override = OVERRIDE_RESET;
+        alarmStartedAt[ a ].data = 0;
+        alarmStartedAt[ a ].ovData = 0;
+        alarmStartedAt[ a ].ovInitData = 0;
+        alarmStartedAt[ a ].override = OVERRIDE_RESET;
     }
     // initialize alarm FIFOs
     for ( p = ALARM_PRIORITY_NONE; p < NUM_OF_ALARM_PRIORITIES; p++ )
     {
-        alarmPriorityFIFO[p] = ALARM_ID_NO_ALARM;
+        alarmPriorityFIFO[ p ] = ALARM_ID_NO_ALARM;
     }
     // initialize composite alarm state
     alarmStatus.alarmsState = ALARM_PRIORITY_NONE;
@@ -181,13 +181,21 @@
         if ( FALSE == getAlarmActive( alarm ) )
         {
             // if alarm is a fault, request transition to fault mode
-            if ( TRUE == alarmTable[alarm].alarmIsFault )
+            if ( TRUE == alarmTable[ alarm ].alarmIsFault )
             {
                 requestNewOperationMode( MODE_FAUL );
             }
             // activate alarm
-            alarmIsActive[alarm].data = TRUE;
-            alarmStartedAt[alarm].data = getMSTimerCount();
+            alarmIsActive[ alarm ].data = TRUE;
+            alarmStartedAt[ alarm ].data = getMSTimerCount();
+#ifdef DEBUG_ENABLED
+            {
+                // TODO - temporary debug code - remove later
+                char debugStr[ 256 ];
+                sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
         }
     }
     else
@@ -211,7 +219,7 @@
 void activateAlarmNoData( ALARM_ID_T alarm )
 {
     // broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[alarm].data )
+    if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( alarm, blankAlarmData, blankAlarmData );
     }
@@ -233,7 +241,7 @@
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
 {
     // broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[alarm].data )
+    if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( alarm, alarmData, blankAlarmData );
     }
@@ -256,7 +264,7 @@
 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 ].data )
     {
         broadcastAlarmTriggered( alarm, alarmData1, alarmData2 );
     }
@@ -279,18 +287,18 @@
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
         // verify alarm can be cleared
-        if ( FALSE == alarmTable[alarm].alarmNoClear )
+        if ( FALSE == alarmTable[ alarm ].alarmNoClear )
         {
             // clear alarm and broadcast alarm clear if not already cleared
-            if ( TRUE == alarmIsActive[alarm].data )
+            if ( TRUE == alarmIsActive[ alarm ].data )
             {
                 broadcastAlarmCleared( alarm );
-                alarmIsActive[alarm].data = FALSE;
-                alarmStartedAt[alarm].data = 0;
+                alarmIsActive[ alarm ].data = FALSE;
+                alarmStartedAt[ alarm ].data = 0;
                 // clear FIFO if this alarm was in it
-                if ( alarmPriorityFIFO[alarmTable[alarm].alarmPriority] == alarm )
+                if ( alarmPriorityFIFO[ alarmTable[ alarm ].alarmPriority ] == alarm )
                 {
-                    resetAlarmPriorityFIFO( alarmTable[alarm].alarmPriority );
+                    resetAlarmPriorityFIFO( alarmTable[ alarm ].alarmPriority );
                 }
             }
         }
@@ -361,13 +369,13 @@
     {
         if ( TRUE == getAlarmActive(a) )
         {
-            ALARM_PRIORITY_T almPriority = alarmTable[a].alarmPriority;
-            if ( ALARM_ID_NO_ALARM == alarmPriorityFIFO[almPriority] )
+            ALARM_PRIORITY_T almPriority = alarmTable[ a ].alarmPriority;
+            if ( ALARM_ID_NO_ALARM == alarmPriorityFIFO[ almPriority ] )
             {
-                alarmPriorityFIFO[almPriority] = a;
+                alarmPriorityFIFO[ almPriority ] = a;
             }
             highestPriority = MAX( almPriority, highestPriority );
-            if ( TRUE == alarmTable[a].alarmIsFault )
+            if ( TRUE == alarmTable[ a ].alarmIsFault )
             {
                 faultsActive = TRUE;
             }
@@ -412,7 +420,7 @@
                 break;
 
             case ALARM_PRIORITY_HIGH:
-                if ( TRUE == alarmTable[alarmStatus.alarmTop].alarmIsFault )
+                if ( TRUE == alarmTable[ alarmStatus.alarmTop ].alarmIsFault )
                 {
                     requestAlarmLampPattern( LAMP_PATTERN_FAULT );
                 }
@@ -488,7 +496,7 @@
     // verify priority
     if ( priority < NUM_OF_ALARM_PRIORITIES )
     {
-        alarmPriorityFIFO[priority] = ALARM_ID_NO_ALARM;
+        alarmPriorityFIFO[ priority ] = ALARM_ID_NO_ALARM;
     }
     else
     {
@@ -603,8 +611,8 @@
             if ( tim > value )
             {
                 result = TRUE;
-                alarmStartedAt[alarmID].ovData = (tim - value);
-                alarmStartedAt[alarmID].override = OVERRIDE_KEY;
+                alarmStartedAt[ alarmID ].ovData = ( tim - value );
+                alarmStartedAt[ alarmID ].override = OVERRIDE_KEY;
             }
         }
     }
@@ -631,8 +639,8 @@
         if ( TRUE == isTestingActivated() )
         {
             result = TRUE;
-            alarmStartedAt[alarmID].override = OVERRIDE_RESET;
-            alarmStartedAt[alarmID].ovData = alarmStartedAt[alarmID].ovInitData;
+            alarmStartedAt[ alarmID ].override = OVERRIDE_RESET;
+            alarmStartedAt[ alarmID ].ovData = alarmStartedAt[ alarmID ].ovInitData;
         }
     }