Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r93b7026089877765744c2c465c51fd6912d7084b -rc672f41061bcd500d6593655641cb27ce3ae58fc
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 93b7026089877765744c2c465c51fd6912d7084b)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision c672f41061bcd500d6593655641cb27ce3ae58fc)
@@ -33,7 +33,12 @@
 // ********** public definitions **********
 
 #include "AlarmDefs.h"
-
+
+/// Interval (in ms) at which alarm lamp and audio control will be executed.
+#define ALARM_LAMP_AND_AUDIO_CONTROL_INTERVAL_MS        250
+
+#define MAX_ALARM_VOLUME_LEVEL                          7
+
 /// Alarm data types list.
 typedef enum Alarm_Data_Types
 {
@@ -166,8 +171,8 @@
     SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_DIRECTION,
     SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_STATE,              // 40
     SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH,
-    SW_FAULT_ID____AVAILABLE_1,
-    SW_FAULT_ID____AVAILABLE_2,
+    SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE,
+    SW_FAULT_ID_FPGA_INVALID_ALARM_AUDIO_PARAM,
     SW_FAULT_ID_RTC_EXEC_INVALID_STATE,
     SW_FAULT_ID_RTC_SELF_TEST_INVALID_STATE,                            // 45
     SW_FAULT_ID_RTC_TRANSACTION_SERVICE_INVALID_STATE,
@@ -232,10 +237,9 @@
 void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action );
 BOOL isAlarmActive( ALARM_ID_T alarm );
 ALARM_PRIORITY_T getCurrentAlarmStatePriority( void );
-BOOL isAlarmRecoverable( ALARM_ID_T alarm );
+BOOL isAlarmRecoverable( ALARM_ID_T alarm );
+void setAlarmAudioVolume( U32 volumeLevel );
 
-BOOL testSetAlarmStatusPublishIntervalOverride( U32 value );
-BOOL testResetAlarmStatusPublishIntervalOverride( void );
 BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value );
 BOOL testResetAlarmStateOverride( U32 alarmID );
 BOOL testSetAlarmStartOverride( U32 alarmID, U32 value );