Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r29a2c3c7d7618489c0ada9f98e1d30226b455392 -r2a3a47ca90ad19851a30c52f6999a56d5f578783 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 29a2c3c7d7618489c0ada9f98e1d30226b455392) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 2a3a47ca90ad19851a30c52f6999a56d5f578783) @@ -115,12 +115,8 @@ 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 // DEBUG_DENALI -/// 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. @@ -1204,11 +1200,13 @@ { 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 ) {