Index: AlarmDefs.h =================================================================== diff -u -rbc2f23b1eb6e06dea4cc5c32a897d8ab2bd9fbc9 -r98ba754d335156420aeb2665bfa6c4f51fadae7e --- AlarmDefs.h (.../AlarmDefs.h) (revision bc2f23b1eb6e06dea4cc5c32a897d8ab2bd9fbc9) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 98ba754d335156420aeb2665bfa6c4f51fadae7e) @@ -104,7 +104,7 @@ ALARM_ID____AVAILABLE_21 = 66, ///< This alarm ID is available for use ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67, ///< HD blood pump occlusion self-test failure alarm ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE = 68, ///< HD active reservoir recirculation out of range - ALARM_ID____AVAILABLE_6 = 69, ///< This alarm ID is available for use + ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD = 69, ///< HD blood leak sensor invalid calibration record ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 70, ///< HD arterial pressure self-test failure alarm ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 71, ///< HD venous pressure self-test failure alarm ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 72, ///< HD blood flow meter status check self-test failure alarm @@ -324,7 +324,6 @@ ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286, ///< HD treatment rinseback complete timeout warning ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287, ///< HD processor clock speed checks against FPGA clock failure ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288, ///< DG trimmer heater on with flow timeout - ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD = 289, ///< HD blood leak invalid calibration record NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -513,8 +512,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_21, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_6, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -743,7 +742,6 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -830,7 +828,6 @@ { 3, ALARM_ID____AVAILABLE_21 }, { 3, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, - { 3, ALARM_ID____AVAILABLE_6 }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE },