Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rfc12876da6930c955864352182aee2076513a1cc -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision fc12876da6930c955864352182aee2076513a1cc) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -90,11 +90,11 @@ /// Lookup table to determine appropriate divider for a given alarm audio volume level. const U08 ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL][NUM_OF_ALARM_AUDIO_VOLUME_FACTORS] = { - { 2, 1 }, + { 1, 0 }, { 1, 1 }, - { 0, 1 }, - { 0, 3 }, - { 0, 5 } + { 3, 1 }, + { 3, 2 }, + { 4, 2 } }; // ********** private data ********** @@ -833,18 +833,18 @@ { U32 volume = getAlarmAudioVolume(); - // If we're not in Init-POST mode, ensure audio test tone request is cancelled. - if ( getCurrentOperationMode() != MODE_INIT ) - { - alarmAudioTestToneRequested = FALSE; - } - // If audio test in progress, play test tone. if ( TRUE == alarmAudioTestToneRequested ) { // Play test tone at min volume setAlarmAudioState( ALARM_AUDIO_TEST_TONE, - ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL-1][ALARM_AUDIO_VOLUME_GAIN], - ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL-1][ALARM_AUDIO_VOLUME_DIVIDER] ); + ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_GAIN], + ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_DIVIDER] ); + // If we're in Fault mode, ensure audio test tone request is cancelled. + if ( MODE_FAUL == getCurrentOperationMode() ) + { + alarmAudioTestToneRequested = FALSE; + } + } // If alarm silenced, play no alarm audio. else if ( TRUE == alarmStatus.alarmsSilenced )