Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -336,8 +336,13 @@
 {
     // Broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ] )
-    {
-        broadcastAlarmTriggered( alarm, alarmData1, alarmData2 );
+    {
+        ALARM_TRIGGERED_PAYLOAD_T data;
+
+        data.alarm = (U32)alarm;
+        data.almData1 = alarmData1;
+        data.almData2 = alarmData2;
+        broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
         // Send information for UI to log to treatment log
         if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
         {
@@ -364,8 +369,10 @@
         // Clear alarm condition and broadcast alarm condition clear if not already cleared
         if ( TRUE == alarmIsDetected[ alarm ] )
         {
+            U32 a = (U32)alarm;
+
             alarmIsDetected[ alarm ] = FALSE;
-            broadcastAlarmConditionCleared( alarm );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
         }
     }
 }
@@ -390,8 +397,10 @@
         {
             // Clear alarm and broadcast alarm clear if not already cleared
             if ( TRUE == alarmIsActive[ alarm ] )
-            {
-                broadcastAlarmCleared( alarm );
+            {
+                U32 a = (U32)alarm;
+
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
                 alarmIsActive[ alarm ] = FALSE;
                 clearAlarmCondition( alarm );
 
@@ -1175,7 +1184,7 @@
         data.backupAudioCurr = getAlarmAudioBackupCurrent();
         data.safetyShutdown = isSafetyShutdownActivated();
 
-        broadcastAlarmInfo( data );
+        broadcastData( MSG_ID_HD_ALARM_INFORMATION, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( ALARM_INFO_PAYLOAD_T ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }
@@ -1262,8 +1271,7 @@
 /*********************************************************************//**
  * @brief
  * The execAlarmAudioSelfTest function outputs a test audio tone and
- * measures the audio current level.  The test passes if the audio current
- * exceeds TBD mA.
+ * measures the audio current level.
  * @details Inputs: alarmAudioSelfTestState
  * @details Outputs: none
  * @return the current backup alarm audio current (in mA).
@@ -1472,7 +1480,9 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    broadcastAlarmCleared( a );
+                    U32 al = (U32)a;
+
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&al, sizeof( U32 ) );
                     alarmIsActive[ a ] = FALSE;
                     alarmStartedAt[ a ].data = 0;
                     // Clear FIFO if this alarm was in it