Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rbc29cfd7dc00191e3f5e26c29f7e21bef178d815 -r45a5b4b93d1793860d5a000406591ee5cf6935d6 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision bc29cfd7dc00191e3f5e26c29f7e21bef178d815) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 45a5b4b93d1793860d5a000406591ee5cf6935d6) @@ -8,7 +8,7 @@ * @file AlarmMgmt.c * * @author (last) Dara Navaei -* @date (last) 26-Mar-2022 +* @date (last) 09-Aug-2022 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -185,7 +185,7 @@ * @return none *************************************************************************/ void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 ) -{ +{ // broadcast alarm and data if alarm not already active if ( ( FALSE == alarmIsActive[ alarm ] ) && ( TRUE == isHDCommunicating() ) ) { @@ -292,36 +292,6 @@ /*********************************************************************//** * @brief - * The checkPersistentAlarm function triggers/clears an alarm if an alarm condition - * has persisted/cleared over given time limit. - * @details Inputs: none - * @details Outputs: checks whether an alarm is triggered or an alarm condition is cleared - * @param alarmID ID of alarm to check - * @param isErrorOccured Flag indicates alarm condition is active or not - * @param data alarm data - * @param limit alarm condition limit - * @return TRUE if given alarm is active, FALSE if not - *************************************************************************/ -BOOL checkPersistentAlarm( ALARM_ID_T alarm, BOOL const isErrorOccured, F32 const data, F32 const limit ) -{ - BOOL status = FALSE; - - if ( TRUE == isPersistentAlarmTriggered( alarm, isErrorOccured ) ) - { - SET_ALARM_WITH_2_F32_DATA( alarm, data, limit ); - } - - if ( TRUE == isPersistentAlarmConditionCleared( alarm, isErrorOccured ) ) - { - clearAlarmCondition( alarm ); - status = TRUE; - } - - return status; -} - -/*********************************************************************//** - * @brief * The handleResendActiveAlarmsRequest function processes the request to re-send * all active alarms. * @details Inputs: alarmIsActive[]