Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -ra3858dc599d0d0706e606bc1a3c86609cf7f1602 -r5292163c9b02b82b52cd4a498fdc3350875cb7d2
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a3858dc599d0d0706e606bc1a3c86609cf7f1602)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5292163c9b02b82b52cd4a498fdc3350875cb7d2)
@@ -267,18 +267,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 );
 }
 
 /*********************************************************************//**
@@ -294,17 +284,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 );
 }
 
 /*********************************************************************//**
@@ -324,7 +304,7 @@
     // 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 )
         {