Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6b870cd0699bb3ee22b93981d51373a6c2d56162 -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6b870cd0699bb3ee22b93981d51373a6c2d56162)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
@@ -246,18 +246,6 @@
         broadcastAlarmTriggered( (U16)alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
     }
     activateAlarm( alarm );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        // 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
 }
 
 /*********************************************************************//**
@@ -279,18 +267,6 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData, BLANK_ALARM_DATA );
     }
     activateAlarm( alarm );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        // 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
 }
 
 /*********************************************************************//**
@@ -313,18 +289,6 @@
         broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
     }
     activateAlarm( alarm );
-#ifdef DEBUG_ENABLED
-#ifdef ALARMS_DEBUG
-    if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        // TODO - temporary debug code - remove later
-        char debugStr[ 256 ];
-        sprintf( debugStr, "ALARM trig:%5d %8X %8X \n", (S32)alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-        sendDebugDataToUI( (U08*)debugStr );
-    }
-#endif
-#endif
 }
 
 /*********************************************************************//**
@@ -373,25 +337,14 @@
             {
                 broadcastAlarmCleared( alarm );
                 alarmIsActive[ alarm ] = FALSE;
-                alarmIsDetected[ alarm ] = FALSE;
+                clearAlarmCondition( alarm );
 
                 alarmStartedAt[ alarm ].data = 0;
                 // Clear FIFO if this alarm was in it
                 if ( alarmPriorityFIFO[ ALARM_TABLE[ alarm ].alarmPriority ].alarmID == alarm )
                 {
                     resetAlarmPriorityFIFO( ALARM_TABLE[ 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) );
-                    sendDebugDataToUI( (U08*)debugStr );
-                }
-#endif
-#endif
             }
         }
     }