Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0 -r58f8416a9ff9c68ee34361ac23a46dcf56cfa79e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 58f8416a9ff9c68ee34361ac23a46dcf56cfa79e)
@@ -280,18 +280,8 @@
  * @return none
  *************************************************************************/
 void activateAlarmNoData( ALARM_ID_T alarm )
-{
-    // Broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        broadcastAlarmTriggered( (U16)alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
-        // Send information for UI to log to treatment log
-        if ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog )
-        {
-            sendTreatmentLogAlarmEventData( alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
-        }
-    }
-    activateAlarm( alarm );
+{
+    activateAlarm2Data( alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
 }
 
 /*********************************************************************//**
@@ -307,17 +297,7 @@
  *************************************************************************/
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
 {
-    // Broadcast alarm and data if alarm not already active
-    if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        broadcastAlarmTriggered( (U16)alarm, alarmData, BLANK_ALARM_DATA );
-        // Send information for UI to log to treatment log
-        if ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog )
-        {
-            sendTreatmentLogAlarmEventData( alarm, alarmData, BLANK_ALARM_DATA );
-        }
-    }
-    activateAlarm( alarm );
+    activateAlarm2Data( alarm, alarmData, BLANK_ALARM_DATA );
 }
 
 /*********************************************************************//**
@@ -337,9 +317,9 @@
     // Broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ] )
     {
-        broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 );
+        broadcastAlarmTriggered( alarm, alarmData1, alarmData2 );
         // Send information for UI to log to treatment log
-        if ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog )
+        if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
         {
             sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
         }