Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r4aa825df0b7a7b93c6a7f1d4408d02844f4213f0 -r27a68f930508638f2eb6265ebb381c8918cbc37b
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4aa825df0b7a7b93c6a7f1d4408d02844f4213f0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
@@ -63,8 +63,8 @@
 #define CLR_BACKUP_AUDIO_ENABLE()             {mibspiREG3->PC3 &= ~BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK;} ///< Macro to disable backup alarm audio.
 
 #define ALARM_AUDIO_TEST_TONE                 4                                                         ///< Alarm audio state for continuous test tone.
-#define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0                                                      ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
-#define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0                                                      ///< Minimum audio current (low gain) during test tone self-test (in mA).
+#define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0F                                                     ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
+#define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0F                                                     ///< Minimum audio current (low gain) during test tone self-test (in mA).
 #define ALARM_AUDIO_MAX_TEST_TIME_MS          1000                                                      ///< Maximum time for audio current to reach threshold in test.
 #define MAX_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for maximum alarm audio volume.
 #define MIN_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for minimum alarm audio volume.
@@ -338,6 +338,9 @@
         data.almData1 = alarmData1.data.uInt.data;
         data.almDataType2 = (U32)alarmData2.dataType;
         data.almData2 = alarmData2.data.uInt.data;
+        data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
+        data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
+        data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
 
         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
@@ -366,10 +369,12 @@
         // Clear alarm condition and broadcast alarm condition clear if not already cleared
         if ( TRUE == alarmIsDetected[ alarm ] )
         {
-            U32 a = (U32)alarm;
+            ALARM_NAME_DATA_T data;
 
+            data.alarmName = (U32)alarm;
+
             alarmIsDetected[ alarm ] = FALSE;
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
         }
     }
 }
@@ -395,9 +400,11 @@
             // Clear alarm and broadcast alarm clear if not already cleared
             if ( TRUE == alarmIsActive[ alarm ] )
             {
-                U32 a = (U32)alarm;
+                ALARM_NAME_DATA_T data;
+
+                data.alarmName = (U32) alarm;
 
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
                 alarmIsActive[ alarm ] = FALSE;
                 clearAlarmCondition( alarm );
 
@@ -894,6 +901,7 @@
     else
     {
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
+#ifndef _RELEASE_
         {
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
             {
@@ -903,6 +911,7 @@
             }
         }
         else
+#endif
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
             setAlarmAudioState( ALARM_PRIORITY_HIGH,
@@ -1470,9 +1479,11 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    U32 al = (U32)a;
+                    ALARM_NAME_DATA_T data;
 
-                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&al, sizeof( U32 ) );
+                    data.alarmName = (U32)a;
+
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
                     alarmIsActive[ a ] = FALSE;
                     alarmStartedAt[ a ].data = 0;
                     // Clear FIFO if this alarm was in it