Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c5e1315bfeb11335f66f7439e00857f26649e25b)
@@ -124,20 +124,19 @@
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
-    }
-    activateAlarm( alarm );
-#ifdef DEBUG_ENABLED
+#ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
-    if ( FALSE == alarmIsActive[ alarm ].data )
-    {
-        // TODO - temporary debug code - remove later
-        char debugStr[ 256 ];
-        sprintf( debugStr, "ALARM trig:%5d \n", alarm );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-        sendDebugDataToUI( (U08*)debugStr );
+        {
+            // 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
     }
-#endif
-#endif
+    activateAlarm( alarm );
 }
 
 /*************************************************************************
@@ -158,20 +157,19 @@
     if ( FALSE == alarmIsActive[ alarm ].data )
     {
         broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
-    }
-    activateAlarm( alarm );
-#ifdef DEBUG_ENABLED
+#ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
-    if ( FALSE == alarmIsActive[ alarm ].data )
-    {
-        // 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 );
+        {
+            // 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
     }
-#endif
-#endif
+    activateAlarm( alarm );
 }
 
 /*************************************************************************
@@ -193,20 +191,19 @@
     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
-    if ( FALSE == alarmIsActive[ alarm ].data )
-    {
-        // 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
 }
 
 /*************************************************************************
@@ -231,7 +228,6 @@
             alarmIsActive[ alarm ].data = FALSE;
 #ifdef DEBUG_ENABLED
 #ifdef ALARMS_DEBUG
-            if ( FALSE == alarmIsActive[ alarm ].data )
             {
                 // TODO - temporary debug code - remove later
                 char debugStr[ 256 ];