Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6d2d8f0267c57135554e5a1acaca9aef37f27949 -r738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6d2d8f0267c57135554e5a1acaca9aef37f27949)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61)
@@ -40,7 +40,6 @@
 // ********** private function prototypes **********
 
 static void activateAlarm( ALARM_ID_T alarm );
-
 static DATA_ARRAY_GET_PROTOTYPE( BOOL, getAlarmActive, alarmID );
 
 /*************************************************************************
@@ -100,14 +99,6 @@
         {
             // activate alarm
             alarmIsActive[ alarm ].data = TRUE;
-#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
@@ -136,6 +127,16 @@
         broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
     }
     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
 }
 
 /*************************************************************************
@@ -158,6 +159,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
     }
     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
 }
 
 /*************************************************************************
@@ -181,6 +192,16 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
     }
     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
 }
 
 /*************************************************************************
@@ -203,6 +224,16 @@
         {
             broadcastAlarmCleared( alarm );
             alarmIsActive[ alarm ].data = FALSE;
+#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) );
+            }
+#endif
+#endif
         }
     }
     else