Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rc9cf3c88d4db4ddeb62c85489bbcb25e48688c35 -ra60ec05d359c0d3f014015e9080b6dbcef0fea28
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c9cf3c88d4db4ddeb62c85489bbcb25e48688c35)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a60ec05d359c0d3f014015e9080b6dbcef0fea28)
@@ -253,14 +253,6 @@
             // activate alarm
             alarmIsActive[ alarm ] = 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
@@ -289,6 +281,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
 }
 
 /*************************************************************************
@@ -311,6 +313,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 );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -334,6 +346,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, alarmData2.data.uInt );
+                sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            }
+#endif
+#endif
 }
 
 /*************************************************************************
@@ -365,6 +387,16 @@
                 {
                     resetAlarmPriorityFIFO( alarmTable[ alarm ].alarmPriority );
                 }
+#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
             }
         }
     }