Index: AlarmDefs.h =================================================================== diff -u -rfbe00c5279c7639312b34a6c36615d478a613889 -r9dafbdae4deef0e47702e0eaa595b2b8cd9e0076 --- AlarmDefs.h (.../AlarmDefs.h) (revision fbe00c5279c7639312b34a6c36615d478a613889) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 9dafbdae4deef0e47702e0eaa595b2b8cd9e0076) @@ -98,8 +98,8 @@ ALARM_ID_HD_VALVE_NOT_FUNCTIONAL = 60, ///< HD valve not functional ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE = 61, ///< HD valve current out of range ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE = 62, ///< HD valve position out of target - ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 63, ///< FPGA reports failure reading arterial pressure sensor - ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 64, ///< FPGA reports failure reading venous pressure sensor + ALARM_ID__AVAILABLE_11 = 63, ///< Alarm ID available + ALARM_ID__AVAILABLE_14 = 64, ///< Alarm ID availabl ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65, ///< HD requests DG command with invalid parameter fault ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE = 66, ///< HD blood leak sensor set point set failure ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67, ///< HD blood pump occlusion self-test failure alarm @@ -119,12 +119,12 @@ ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR = 81, ///< HD syringe pump over travel error ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR = 82, ///< HD syringe pump DAC write failure ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR = 83, ///< HD syringe pump is running while the BP is off - ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84, ///< HD venous pressure sensor not being read + ALARM_ID__AVAILABLE_12 = 84, ///< Alarm ID available ALARM_ID_PUMP_TRACK_LATCH_OPENED = 85, ///< HD pump track latch opened alarm - ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86, ///< HD BP occlusion sensor not being read + ALARM_ID__AVAILABLE_17 = 86, ///< Alarm ID available ALARM_ID_DG_HEATING_INVALID_CAL_RECORD = 87, ///< DG heating invalid calibration record ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 88, ///< DG concentrate pumps hall sensor out of range - ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error + ALARM_ID__AVAILABLE_15 = 89, ///< Alarm ID available ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT = 90, ///< DG load cells A1/B1 FPGA fault ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE = 91, ///< HD No dialysate flow data receive in the last 3 seconds ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS = 92, ///< DG conductivity sensor bad status. @@ -315,7 +315,7 @@ ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 278, ///< HD active reservoir weight out of range. ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT = 279, ///< DG dialysate drain time out - ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR = 280, ///< HD arterial pressure sensor read timeout error + ALARM_ID__AVAILABLE_10 = 280, ///< Alarm ID available for use ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281, ///< Acid concentration bottle low volume alarm ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282, ///< Bicarbonate concentration bottle low volume alarm ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283, ///< DG load cells weight out of range @@ -525,8 +525,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_NOT_FUNCTIONAL, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_CURRENT_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_HD_VALVE_POSITION_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_ARTERIAL_PRESSURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_VENOUS_PRESSURE_SENSOR_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_11, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_14, 0, ALARM_ID_NO_ALARM }, { 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 , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_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_BP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -547,12 +547,12 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_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_DAC_WRITE_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_RUNNING_WHILE_BP_OFF_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_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PUMP_TRACK_LATCH_OPENED, 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_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_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_HD_BP_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_15, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_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_DIALYSATE_FLOW_DATA_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, 0, ALARM_ID_NO_ALARM }, @@ -751,7 +751,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT, 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_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -859,8 +859,8 @@ { 3, ALARM_ID_HD_VALVE_NOT_FUNCTIONAL }, { 3, ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE }, { 3, ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE }, - { 3, ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT }, - { 3, ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT }, + { 3, ALARM_ID__AVAILABLE_11 }, + { 3, ALARM_ID__AVAILABLE_14 }, { 3, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT }, { 3, ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE }, { 3, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, @@ -879,11 +879,11 @@ { 3, ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR }, - { 3, ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR }, + { 3, ALARM_ID__AVAILABLE_12 }, + { 3, ALARM_ID__AVAILABLE_17 }, { 3, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD }, { 3, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, - { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, + { 3, ALARM_ID__AVAILABLE_15 }, { 3, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT }, { 3, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE }, { 3, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS }, @@ -925,7 +925,7 @@ { 3, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE }, { 3, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, - { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR }, + { 3, ALARM_ID__AVAILABLE_10 }, { 3, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, { 3, ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE },