Index: AlarmMgmt.c =================================================================== diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -r842d6d28b1f88d07b9aedfec86e6dc0b677ad669 --- AlarmMgmt.c (.../AlarmMgmt.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) +++ AlarmMgmt.c (.../AlarmMgmt.c) (revision 842d6d28b1f88d07b9aedfec86e6dc0b677ad669) @@ -39,6 +39,7 @@ // ********** private data ********** +static COMP_ALARM_STATUS_T alarmStatus; static BOOL alarmIsActive[ NUM_OF_ALARM_IDS ]; ///< Table - current state of each alarm static BOOL alarmIsDetected[ NUM_OF_ALARM_IDS ]; ///< Table - current state of each alarm condition (detected or cleared) @@ -61,6 +62,20 @@ alarmIsActive[ a ] = FALSE; alarmIsDetected[ a ] = FALSE; } + + alarmStatus.alarmsState = ALARM_PRIORITY_NONE; + alarmStatus.alarmTop = ALARM_ID_NO_ALARM; + alarmStatus.topAlarmConditionDetected = FALSE; + alarmStatus.systemFault = FALSE; + alarmStatus.stop = FALSE; + alarmStatus.lampOn = FALSE; + alarmStatus.noClear = FALSE; + alarmStatus.noResume = FALSE; + alarmStatus.noRinseback = FALSE; + alarmStatus.noEndTreatment = FALSE; + alarmStatus.noBloodRecirc = FALSE; + alarmStatus.noDialRecirc = FALSE; + alarmStatus.ok = FALSE; } /*********************************************************************//** @@ -278,6 +293,19 @@ /*********************************************************************//** * @brief + * The doesAlarmStatusIndicateStop function determines whether any currently + * active alarm has stop property. + * @details Inputs: alarmStatus + * @details Outputs: none + * @return TRUE if any active alarm has stop property, FALSE if not + *************************************************************************/ +BOOL doesAlarmStatusIndicateStop( void ) +{ + return alarmStatus.stop; +} + +/*********************************************************************//** + * @brief * The setAlarmActive function sets the active flag for a given alarm. * @details \b Inputs: none * @details \b Outputs: alarmIsActive[]