Index: AlarmDefs.h =================================================================== diff -u -rc1b890c413d982edab5da56964d7968d8f0ae1c0 -rabc61f3b4986c055d50fe70aad2776be47f29f6d --- AlarmDefs.h (.../AlarmDefs.h) (revision c1b890c413d982edab5da56964d7968d8f0ae1c0) +++ AlarmDefs.h (.../AlarmDefs.h) (revision abc61f3b4986c055d50fe70aad2776be47f29f6d) @@ -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, 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, 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, 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, 10, 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, 10, 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, 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, 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, 10, 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, 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, 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, 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, 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, 10, 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, 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, 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, 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 }, Index: MsgDefs.h =================================================================== diff -u -r6878daf001fc7b7429dbf8f7133f0e3cb436af75 -rabc61f3b4986c055d50fe70aad2776be47f29f6d --- MsgDefs.h (.../MsgDefs.h) (revision 6878daf001fc7b7429dbf8f7133f0e3cb436af75) +++ MsgDefs.h (.../MsgDefs.h) (revision abc61f3b4986c055d50fe70aad2776be47f29f6d) @@ -563,7 +563,7 @@ REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18, ///< The Heparin pre-stop setting is greater than the treatment duration REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED = 19, ///< DG filter flush time has been expired - REQUEST_REJECT_REASON_AVAILABLE_2 = 20, ///< Not used + REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_ALLOWED = 20, ///< Saline bolus is not allowed (due to blood and dialysate recirculation blockage) REQUEST_REJECT_REASON_AVAILABLE_3 = 21, ///< Not used REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22, ///< A saline bolus is not in progress REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23, ///< Requested user action is disabled in current state