Index: AlarmDefs.h =================================================================== diff -u -r6cedea4f4829cbe7ddaf0eaacdbf05970585d5e5 -ra20a4ac1e56b480b04b087f447da8afd4e30a978 --- AlarmDefs.h (.../AlarmDefs.h) (revision 6cedea4f4829cbe7ddaf0eaacdbf05970585d5e5) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a20a4ac1e56b480b04b087f447da8afd4e30a978) @@ -122,17 +122,17 @@ ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84, ///< HD venous pressure sensor not being read ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 85, ///< HD venous pressure sensor temperature out of range error ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86, ///< HD BP occlusion sensor not being read - ALARM_ID____AVAILABLE_10 = 87, ///< HD DPi occlusion sensor not being read - ALARM_ID____AVAILABLE_11 = 88, ///< HD DPo occlusion sensor not being read + ALARM_ID____AVAILABLE_10 = 87, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_11 = 88, ///< This alarm ID is available for use ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error - ALARM_ID____AVAILABLE_12 = 90, ///< HD DPi occlusion sensor error - ALARM_ID____AVAILABLE_13 = 91, ///< HD DPo occlusion sensor error - ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92, ///< HD blood flow sensor not being read TODO remove this alarm when FMB fully removed - ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93, ///< HD blood flow sensor error TODO remove this alarm when FMB fully removed - ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94, ///< HD dialysate flow sensor not being read TODO remove this alarm when FMD fully removed - ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 95, ///< HD dialysate flow sensor error TODO remove this alarm when FMD fully removed - ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 96, ///< HD blood flow sensor not being read - slow packet TODO remove this alarm when FMB fully removed - ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 97, ///< HD dialysate flow sensor not being read - slow packet TODO remove this alarm when FMD fully removed + ALARM_ID____AVAILABLE_12 = 90, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_13 = 91, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_14 = 92, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_15 = 93, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_16 = 94, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_17 = 95, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_18 = 96, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_19 = 97, ///< This alarm ID is available for use ALARM_ID_HD_BATTERY_COMM_FAULT = 98, ///< HD battery communication fault ALARM_ID_HD_SYRINGE_PUMP_STALL = 99, ///< HD syringe pump stall alarm ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100, ///< HD no cartridge self-test timeout @@ -193,8 +193,8 @@ ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR = 155, ///< DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156, ///< HW usage data (treatment time in HD and total consumed water in DG) failure ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 157, ///< Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging - ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158, ///< Blood pump failed flow vs. motor speed check. TODO remove this alarm when FMB fully removed - ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159, ///< Dialysate inlet pump failed flow vs. motor speed check. TODO remove this alarm when FMD fully removed + ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158, ///< Blood pump failed flow vs. motor speed check. + ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159, ///< Dialysate inlet pump failed flow vs. motor speed check. ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160, ///< Blood pump rotor speed too high ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 161, ///< Blood flow sensor signal strength too low TODO remove this alarm when FMB fully removed ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 162, ///< Dialysate flow sensor signal strength too low TODO remove this alarm when FMD fully removed @@ -314,7 +314,7 @@ ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276, ///< HD venous pressure sensor is reading out of range ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range ALARM_ID____AVAILABLE_3 = 278, ///< This alarm ID is available for use - ALARM_ID____AVAILABLE_4 = 279, ///< This alarm ID is available for use + 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_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 @@ -537,12 +537,12 @@ { 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_12, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_13, 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_FLOW_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_HD_BP_FLOW_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_HD_DP_FLOW_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_HD_DP_FLOW_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_HD_BP_FLOW_SLOW_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_HD_DP_FLOW_SLOW_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_14, 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, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_16, 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, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_18, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_19, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_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_SYRINGE_PUMP_STALL, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To @@ -669,7 +669,7 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 901, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, @@ -732,7 +732,7 @@ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck 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_BP_OCCLUSION_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____AVAILABLE_3, 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 , TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , 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_LOW, 999, FALSE, FALSE, TRUE, FALSE, 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, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, @@ -851,12 +851,12 @@ { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, { 3, ALARM_ID____AVAILABLE_12 }, { 3, ALARM_ID____AVAILABLE_13 }, - { 3, ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_BP_FLOW_SENSOR_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_SENSOR_ERROR }, - { 3, ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR }, + { 3, ALARM_ID____AVAILABLE_14 }, + { 3, ALARM_ID____AVAILABLE_15 }, + { 3, ALARM_ID____AVAILABLE_16 }, + { 3, ALARM_ID____AVAILABLE_17 }, + { 3, ALARM_ID____AVAILABLE_18 }, + { 3, ALARM_ID____AVAILABLE_19 }, { 3, ALARM_ID_HD_BATTERY_COMM_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_STALL }, { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT }, @@ -894,7 +894,7 @@ { 3, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE }, { 3, ALARM_ID____AVAILABLE_3 }, - { 3, ALARM_ID____AVAILABLE_4 }, + { 3, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, @@ -989,6 +989,7 @@ { 799, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT }, { 799, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, + { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, @@ -997,7 +998,6 @@ { 899, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM }, { 899, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE }, { 899, ALARM_ID_HD_SYRINGE_DETECTED }, - { 899, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 899, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW }, { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING },