Index: AlarmDefs.h =================================================================== diff -u -rbc5ff16e36ae84d132d950dc85a8e9994c570540 -r8a6851fd7f8e8710b63d1f32537ed6699f9a5757 --- AlarmDefs.h (.../AlarmDefs.h) (revision bc5ff16e36ae84d132d950dc85a8e9994c570540) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 8a6851fd7f8e8710b63d1f32537ed6699f9a5757) @@ -49,8 +49,8 @@ ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 11, //TODO remove when DEN-12931 was merged ///< Alarm ID available for use ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed - ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION = 14, ///< HD blood flow invalid calibration - ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION = 15, ///< HD dialysate flow invalid calibration + ALARM_ID___AVAILABLE_1 = 14, ///< Not used - Available for use + ALARM_ID___AVAILABLE_2 = 15, ///< Not used - Available for use ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE = 16, ///< HD alarm audio failed POST ALARM_ID_HD_UI_POST_FAILED = 17, ///< HD UI POST failed ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD = 18, ///< DG load cells invalid calibration record @@ -62,8 +62,8 @@ ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD = 24, ///< DG bicarb concentrate calibration record ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD = 25, ///< DG accelerometer invalid calibration record ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD = 26, ///< HD accelerometer invalid calibration record - ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD = 27, ///< HD blood flow invalid calibration record - ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD = 28, ///< HD dialyzer flow invalid calibration record + ALARM_ID_HD___AVAILABLE_3 = 27, ///< Not used - Available for use + ALARM_ID_HD___AVAILABLE_4 = 28, ///< Not used - Available for use ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD = 29, ///< HD heparin force sensor invalid calibration record ALARM_ID_HD_SOFTWARE_FAULT = 30, ///< HD Software fault. Software found itself in an unexpected state ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 31, ///< Blood pump failed motor controller current check. Too high when pump should be off or out of range when pump should be running @@ -107,8 +107,8 @@ 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 - ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE = 73, ///< HD dialysate flow meter status check self-test failure alarm + ALARM_ID_HD___AVAILABLE_5 = 72, ///< Not used - Available for use + ALARM_ID_HD___AVAILABLE_6 = 73, ///< Not used - Available for use ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_SEND_TIMEOUT = 74, ///< HD blood leak detector self-test transmit timeout ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE = 75, ///< HD syringe pump self-test failure alarm ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE = 76, ///< HD monitored voltage is out of range @@ -459,8 +459,8 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, @@ -473,8 +473,8 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_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_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -519,8 +519,8 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , 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 }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_STATUS_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___AVAILABLE_5, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_6, 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_LEAK_SELF_TEST_SEND_TIMEOUT, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -764,8 +764,8 @@ { 1, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, - { 1, ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION }, - { 1, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION }, + { 1, ALARM_ID___AVAILABLE_1 }, + { 1, ALARM_ID___AVAILABLE_2 }, { 1, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_UI_POST_FAILED }, { 1, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD }, @@ -777,8 +777,8 @@ { 1, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD }, - { 1, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD }, - { 1, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD }, + { 1, ALARM_ID_HD___AVAILABLE_3 }, + { 1, ALARM_ID_HD___AVAILABLE_4 }, { 1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { 1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED }, @@ -841,8 +841,8 @@ { 3, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, { 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 }, - { 3, ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE }, + { 3, ALARM_ID_HD___AVAILABLE_5 }, + { 3, ALARM_ID_HD___AVAILABLE_6 }, { 3, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_SEND_TIMEOUT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE },