Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -r93b7026089877765744c2c465c51fd6912d7084b --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 93b7026089877765744c2c465c51fd6912d7084b) @@ -55,7 +55,8 @@ U32 alarmsSilenceExpiresIn; ///< time until alarm silence expires (seconds) BOOL alarmsToEscalate; ///< are any active alarms due to escalate (should UI show count down timer?) U32 alarmsEscalatesIn; ///< time until alarm will escalate (seconds) - ALARM_ID_T alarmTop; ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now + ALARM_ID_T alarmTop; ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now + BOOL topAlarmConditionnDetected; ///< condition for top alarm is still being detected BOOL systemFault; ///< a system fault is active? BOOL stop; ///< we should be in controlled stop right now BOOL noClear; ///< no recovery will be possible @@ -226,7 +227,9 @@ 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 clearAlarm( ALARM_ID_T alarm ); +void clearAlarm( ALARM_ID_T alarm ); +void clearAlarmCondition( ALARM_ID_T alarm ); +void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action ); BOOL isAlarmActive( ALARM_ID_T alarm ); ALARM_PRIORITY_T getCurrentAlarmStatePriority( void ); BOOL isAlarmRecoverable( ALARM_ID_T alarm );