Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67 -r99ec83eff4683ad69a249f935d74cb9226984d21 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 99ec83eff4683ad69a249f935d74cb9226984d21) @@ -7,8 +7,8 @@ * * @file AlarmMgmt.c * -* @author (last) Dara Navaei -* @date (last) 18-Jan-2023 +* @author (last) Sean Nash +* @date (last) 13-Mar-2023 * * @author (original) Sean Nash * @date (original) 07-Nov-2019 @@ -522,7 +522,8 @@ break; case ALARM_USER_ACTION_END_TREATMENT: - initiateAlarmAction( ALARM_ACTION_END_TREATMENT ); + // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI + addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 ); break; case ALARM_USER_ACTION_ACK: @@ -819,6 +820,12 @@ alarmPrimaryAudioCurrentLG.data = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_LG ); alarmBackupAudioCurrent.data = getFPGABackupAlarmAudioCurrent(); + // Check for user confirmation of end treatment alarm response + if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) ) + { + initiateAlarmAction( ALARM_ACTION_END_TREATMENT ); + } + // TODO - Check current vs. expected audio output } @@ -998,17 +1005,17 @@ else { if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES ) -#ifndef _RELEASE_ { +#ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE ) +#endif { setAlarmAudioState( alarmStatus.alarmsState, ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN], ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] ); } } 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,