Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -re49f9b472c6006753e73c2ac263516558874b850 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 4d7d40a27130dc813d653f044cbb856b1b7d8481) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision e49f9b472c6006753e73c2ac263516558874b850) @@ -279,6 +279,23 @@ return result; } +/*********************************************************************//** + * @brief + * The clearAlarmCondition function clears a given alarm's condition detected + * flag. Also an alarm message is broadcast to the rest of the system. + * @details Inputs: none + * @details Outputs: none + * @param alarm ID of alarm to clear condition for + * @return none + *************************************************************************/ +void clearAlarmCondition( ALARM_ID_T alarm ) +{ + // Verify given alarm + if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) ) + { + clearAlarm( alarm ); + } +} /************************************************************************* * TEST SUPPORT FUNCTIONS Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r00a3d52090bee79dac6e9eed3bd79342fcbca83f -re49f9b472c6006753e73c2ac263516558874b850 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 00a3d52090bee79dac6e9eed3bd79342fcbca83f) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision e49f9b472c6006753e73c2ac263516558874b850) @@ -173,9 +173,10 @@ void activateAlarmNoData( ALARM_ID_T alarm ); void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData ); -void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 ); +void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 ); void clearAlarm( ALARM_ID_T alarm ); -BOOL isAlarmActive( ALARM_ID_T alarm ); +BOOL isAlarmActive( ALARM_ID_T alarm ); +void clearAlarmCondition( ALARM_ID_T alarm ); BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value ); BOOL testResetAlarmStateOverride( U32 alarmID );