Index: AlarmDefs.h =================================================================== diff -u -r045c685c6edf3c940e89a3eed9fa868934e58cfc -r6c9e32af878045d0f3dfe0c52d4bc52af454c4eb --- AlarmDefs.h (.../AlarmDefs.h) (revision 045c685c6edf3c940e89a3eed9fa868934e58cfc) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6c9e32af878045d0f3dfe0c52d4bc52af454c4eb) @@ -78,7 +78,7 @@ ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 40, ///< Dialysis outlet pump failed motor off check. Measured speed while commanded off ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 41, ///< Dialysis outlet pump failed motor direction check. Measured vs. commanded ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 42, ///< Dialysis outlet pump failed rotor speed check. Mismatch with rotor and motor speeds - ALARM_ID__AVAILABLE_3 = 43, ///< Alarm ID available for use + ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT = 43, ///< HD blood leak self test fault ALARM_ID_UI_COMM_TIMEOUT = 44, ///< User interface communication timeout ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45, ///< HD too many bad communications CRC ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46, ///< System message that required acknowledgment was not acknowledged @@ -109,7 +109,7 @@ 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_BLOOD_LEAK_SELF_TEST_FAILURE = 74, ///< HD blood leak detector self-test failure alarm + 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 ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 77, ///< DG monitored voltage is out of range @@ -147,8 +147,8 @@ ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109, ///< HD syringe pump volume check error ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR = 110, ///< HD syringe pump speed check error ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 111, ///< HD syringe pump not stopped in off state error - ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_TIMEOUT = 112, ///< HD blood leak zero command timeout. - ALARM_ID__AVAILABLE_4 = 113, ///< Unused - alarm ID is available + ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT = 112, ///< HD blood leak zero command transmit timeout. + ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT = 113, ///< HD blood leak zero command fault. ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114, ///< HD venous air bubble detector self-test failure ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115, ///< DG temperature sensor out of range ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116, ///< DG temperature sensor ADC out of range @@ -489,7 +489,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_3, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To @@ -521,7 +521,7 @@ { 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_BLOOD_LEAK_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_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 }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -561,8 +561,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, 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_ZERO_CMD_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4, 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_ZERO_CMD_SEND_TIMEOUT, 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_ZERO_CMD_FAULT, 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_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -811,7 +811,7 @@ { 3, ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK }, { 3, ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, { 3, ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, - { 3, ALARM_ID__AVAILABLE_3 }, + { 3, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT }, { 3, ALARM_ID_UI_COMM_TIMEOUT }, { 3, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, { 3, ALARM_ID_CAN_MESSAGE_NOT_ACKED }, @@ -841,7 +841,7 @@ { 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_BLOOD_LEAK_SELF_TEST_FAILURE }, + { 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 }, { 3, ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE }, @@ -875,8 +875,8 @@ { 3, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR }, - { 3, ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_TIMEOUT }, - { 3, ALARM_ID__AVAILABLE_4 }, + { 3, ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT }, + { 3, ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT }, { 3, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE },