Index: AlarmDefs.h =================================================================== diff -u -r0471d87a32101df5f4a509337c2bc7e304447e48 -r9ac9d51ebd96dc5e486e8da410ba679af6bdfb85 --- AlarmDefs.h (.../AlarmDefs.h) (revision 0471d87a32101df5f4a509337c2bc7e304447e48) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 9ac9d51ebd96dc5e486e8da410ba679af6bdfb85) @@ -514,29 +514,29 @@ { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_MC_DIRECTION_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_ROTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_OFF_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, - { ALARM_PRIORITY_HIGH, 10, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_OFF_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, - { ALARM_PRIORITY_HIGH, 10, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VALVE_CONTROL_FAILURE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_MOTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CRITICAL_DATA_ERROR }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CRITICAL_DATA_ERROR }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_FAILURE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_FAILURE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_HOMING_FAILED }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT }, @@ -888,25 +888,15 @@ { 10, ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK }, { 10, ALARM_ID_HD_BLOOD_PUMP_MC_DIRECTION_CHECK }, { 10, ALARM_ID_HD_BLOOD_PUMP_ROTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, { 10, ALARM_ID_HD_DIAL_IN_PUMP_OFF_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, { 10, ALARM_ID_HD_DIAL_OUT_PUMP_OFF_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_UI_COMM_TIMEOUT }, { 10, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, { 10, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI }, - { 10, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, { 10, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, { 10, ALARM_ID_HD_BLOOD_PUMP_MOTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_CRITICAL_DATA_ERROR }, - { 10, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { 10, ALARM_ID_HD_VALVE_HOMING_FAILED }, { 10, ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT }, { 10, ALARM_ID_HD_VALVE_NOT_FUNCTIONAL }, @@ -1015,6 +1005,16 @@ { 110, ALARM_ID_TEST_ALARM_NO_DIAL_RECIRC_CLR_TOP_ONLY }, { 110, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, { 110, ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, + { 110, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { 111, ALARM_ID_HD_DG_COMM_TIMEOUT }, { 111, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE }, { 111, ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE },