Index: AlarmMgmt.c =================================================================== diff -u -rcc8db062292cdcbdb29e4174af5976ccf150d0c0 -r2223ae0cb2b668d78037b39ba0e082333be0f914 --- AlarmMgmt.c (.../AlarmMgmt.c) (revision cc8db062292cdcbdb29e4174af5976ccf150d0c0) +++ AlarmMgmt.c (.../AlarmMgmt.c) (revision 2223ae0cb2b668d78037b39ba0e082333be0f914) @@ -43,7 +43,6 @@ // ********** 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) @@ -66,20 +65,6 @@ 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; } /*********************************************************************//** @@ -297,19 +282,6 @@ /*********************************************************************//** * @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[]