Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -8,7 +8,7 @@
 * @file    AlarmMgmt.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @date    (last)      26-Feb-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
@@ -115,19 +115,14 @@
 static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
 /// Interval (in task intervals) at which to publish alarm information to CAN bus.
 static OVERRIDE_U32_T alarmInfoPublishInterval = { ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, 0 };
-#ifndef ALARM_VOLUME_DEFAULT_LOW
-/// Set alarm audio volume attenuation level (0..4 - lower level = higher gain).
-static OVERRIDE_U32_T alarmAudioVolumeLevel = { MIN_ALARM_VOLUME_ATTENUATION, MIN_ALARM_VOLUME_ATTENUATION, MIN_ALARM_VOLUME_ATTENUATION, 0 };
-#else
 static OVERRIDE_U32_T alarmAudioVolumeLevel = { MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, 0 };
-#endif
-/// Alarm audio current (high gain) measured at ADC.
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };
-/// Alarm audio current (low gain) measured at ADC.
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };
-/// Alarm backup audio current measured at ADC.
-static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };
 
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (high gain) measured at ADC.
+
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (low gain) measured at ADC.
+
+static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               /// Alarm backup audio current measured at ADC.
+
 static COMP_ALARM_STATUS_T alarmStatus;                                             ///< Record for the current composite alarm status.
 static ALARM_PRIORITY_RANKS_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];         ///< FIFO - first activated or highest sub-rank alarm in each alarm priority category.
 
@@ -222,7 +217,7 @@
  * @return none
  *************************************************************************/
 void execAlarmMgmt( void )
-{
+{
     monitorAlarms();
     handleAlarmEscalations();
     updateAlarmsState();
@@ -914,11 +909,12 @@
     {
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
         {
-#ifndef DISABLE_ALARM_AUDIO
-            setAlarmAudioState( alarmStatus.alarmsState,
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
-#endif
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                setAlarmAudioState( alarmStatus.alarmsState,
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
+            }
         }
         else
         {
@@ -1042,7 +1038,6 @@
     BOOL noResume = FALSE;
     BOOL noRinseback = FALSE;
     BOOL noEndTreatment = FALSE;
-    BOOL noNewTreatment = FALSE;
     BOOL usrAckReq = FALSE;
     BOOL noMinimize = TRUE;
     ALARM_ID_T   a;
@@ -1055,7 +1050,6 @@
             systemFault = ( TRUE == ALARM_TABLE[ a ].alarmIsFault ? TRUE : systemFault );
             stop = ( TRUE == ALARM_TABLE[ a ].alarmStops ? TRUE : stop );
             noClear = ( TRUE == ALARM_TABLE[ a ].alarmNoClear ? TRUE : noClear );
-            noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );
             // Set user alarm recovery actions allowed flags
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] )
             {
@@ -1115,7 +1109,7 @@
     alarmStatus.noResume = noResume;
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
-    alarmStatus.noNewTreatment |= noNewTreatment;
+    alarmStatus.noNewTreatment |= 0;
     alarmStatus.usrACKRequired = usrAckReq;
     alarmStatus.noMinimize = noMinimize;
 }
@@ -1203,6 +1197,14 @@
 {
     U32 result = alarmAudioVolumeLevel.data;
 
+#ifndef _RELEASE_
+    // Check the software configurations
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_ALARM_VOLUME_DEFAULT_LOW ) )
+    {
+        result = MIN_ALARM_VOLUME_ATTENUATION;
+    }
+#endif
+
     if ( OVERRIDE_KEY == alarmAudioVolumeLevel.override )
     {
         result = alarmAudioVolumeLevel.ovData;