Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -47,7 +47,6 @@
  * @details
  * Inputs : none
  * Outputs : AlarmMgmt module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initAlarmMgmt( void )
@@ -71,7 +70,6 @@
  * @details
  * Inputs :
  * Outputs :
- * @param none
  * @return none
  *************************************************************************/
 void execAlarmMgmt( void )
@@ -85,7 +83,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmIsActive[]
- * @param alarm : ID of alarm to activate
+ * @param alarm ID of alarm to activate
  * @return none
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
@@ -114,8 +112,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarmNoData( ALARM_ID_T alarm )
@@ -124,18 +122,20 @@
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( (U16)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 );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    {
-        // TODO - temporary debug code - remove later
-        char debugStr[ 256 ];
-        sprintf( debugStr, "ALARM triggered:%5d \n", alarm );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-    }
-#endif
-#endif
 }
 
 /*************************************************************************
@@ -146,8 +146,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
@@ -156,18 +156,20 @@
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( (U16)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 );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    {
-        // TODO - temporary debug code - remove later
-        char debugStr[ 256 ];
-        sprintf( debugStr, "ALARM triggered:%5d %8X \n", alarm, alarmData.data.uInt.data );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-    }
-#endif
-#endif
 }
 
 /*************************************************************************
@@ -178,9 +180,9 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData1 : supporting data to include in alarm msg
- * @param alarmData2 : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData1 supporting data to include in alarm msg
+ * @param alarmData2 supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 )
@@ -189,18 +191,20 @@
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( (U16)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 );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    {
-        // TODO - temporary debug code - remove later
-        char debugStr[ 256 ];
-        sprintf( debugStr, "ALARM triggered:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-    }
-#endif
-#endif
 }
 
 /*************************************************************************
@@ -210,7 +214,7 @@
  * @details
  * Inputs : none
  * Outputs : AlarmStatusTable[]
- * @param alarm : ID of alarm to clear
+ * @param alarm ID of alarm to clear
  * @return none
  *************************************************************************/
 void clearAlarm( ALARM_ID_T alarm )
@@ -230,6 +234,7 @@
                 char debugStr[ 256 ];
                 sprintf( debugStr, "ALARM cleared:%5d \n", alarm );
                 sendDebugData( (U08*)debugStr, strlen(debugStr) );
+                sendDebugDataToUI( (U08*)debugStr );
             }
 #endif
 #endif
@@ -248,7 +253,7 @@
  * @details
  * Inputs : alarmIsActive[]
  * Outputs : none
- * @param alarmID : ID of alarm to check
+ * @param alarmID ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
  *************************************************************************/
 BOOL isAlarmActive( ALARM_ID_T alarm )
@@ -264,14 +269,12 @@
  * @details
  * Inputs : alarmIsActive[]
  * Outputs : none
- * @param alarmID : ID of alarm to check
+ * @param alarmID ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
  *************************************************************************/
 static DATA_ARRAY_GET( BOOL, getAlarmActive, alarmID, NUM_OF_ALARM_IDS-1, alarmIsActive, TRUE )
 
-/**@}*/
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -285,8 +288,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm activated or cleared
- * @param alarmID : ID of alarm to activate or clear
- * @param value : override state for the given alarm ID (1=activate, 0=clear)
+ * @param alarmID ID of alarm to activate or clear
+ * @param value override state for the given alarm ID (1=activate, 0=clear)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAlarmStateOverride( U32 alarmID, U32 state )
@@ -319,7 +322,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm cleared
- * @param alarmID : ID of alarm to clear
+ * @param alarmID ID of alarm to clear
  * @return TRUE if alarm clear successful, FALSE if not
  *************************************************************************/
 BOOL testResetAlarmStateOverride( U32 alarmID )
@@ -337,3 +340,5 @@
 
     return result;
 }
+
+/**@}*/