Index: AlarmDefs.h =================================================================== diff -u -r97676f6f2075852ecf369c622003a38332a9e0c8 -rfbe00c5279c7639312b34a6c36615d478a613889 --- AlarmDefs.h (.../AlarmDefs.h) (revision 97676f6f2075852ecf369c622003a38332a9e0c8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision fbe00c5279c7639312b34a6c36615d478a613889) @@ -143,12 +143,12 @@ ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG invalid calibration CRC ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD = 106, ///< DG dialysate flow sensor invalid calibration record ALARM_ID_DG_RESTARTED_FAULT = 107, ///< HD reports DG restarted fault - ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108, ///< HD syringe pump ADC error + ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT = 108, ///< HD syringe pump ADC FPGA fault 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_DG_LOAD_CELL_A2_B2_FPGA_FAULT = 112, ///< DG load cells A1/B1 FPGA fault - ALARM_ID__AVAILABLE_8 = 113, ///< Alarm ID available + ALARM_ID__AVAILABLE_8 = 113, ///< Alarm ID available for use 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_SENSORS_ADC_FAULT = 116, ///< DG temperature sensor ADC fault @@ -257,8 +257,8 @@ ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 219, ///< HD syringe pump syringe removed alarm ALARM_ID_DG_THD_SENSORS_FPGA_FAULT = 220, ///< DG THd sensors FPGA fault ALARM_ID_EMPTY_SALINE_BAG = 221, ///< HD Saline bag is empty - ALARM_ID__AVAILABLE_9 = 222, ///< Alarm ID available - ALARM_ID__AVAILABLE_10 = 223, ///< Alarm ID available + ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT = 222, ///< HD occlusion sensor FPGA fault + ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT = 223, ///< HD arterial sensor FPGA fault ALARM_ID_TREATMENT_STOPPED_BY_USER = 224, ///< Treatment stopped by user action - pressed stop button ALARM_ID_END_OF_TREATMENT_WARNING = 225, ///< HD end of treatment warning ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 226, ///< HD prime completed low priority alarm @@ -325,7 +325,7 @@ ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287, ///< HD processor clock speed checks against FPGA clock failure ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 288, ///< HD load cells primary/back up drift out of range ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION = 289, ///< DG dialysate or concentrate caps not closed - ALARM_ID__AVAILABLE_12 = 290, ///< Alarm ID available + ALARM_ID_HD_VENOUS_SENSOR_FPGA_FAULT = 290, ///< HD venous pressure sensor FPGA fault ALARM_ID_HD_DISINFECT_FLUSH = 291, ///< HD processor is in Disinfect Flush mode ALARM_ID_HD_DISINFECT_HEAT = 292, ///< HD processor is in Disinfect Heat mode ALARM_ID_HD_DISINFECT_CHEM = 293, ///< HD processor is in Disinfect Chemical mode @@ -572,11 +572,11 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESTARTED_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_ADC_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_FPGA_ADC_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_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, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT, 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_A2_B2_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__AVAILABLE_8, 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 }, @@ -690,8 +690,8 @@ { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH , 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , 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, TRUE , ALARM_ID__AVAILABLE_9, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, - { ALARM_PRIORITY_LOW, 902, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID__AVAILABLE_10, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_OCCLUSION_SENSOR_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_ARTERIAL_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 903, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER, 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_LOW, 904, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_WARNING, 0, ALARM_ID_NO_ALARM }, @@ -761,7 +761,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, 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_HD_VENOUS_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_FLUSH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_HEAT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM, 0, ALARM_ID_NO_ALARM }, @@ -898,7 +898,7 @@ { 3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS }, { 3, ALARM_ID_DG_RESTARTED_FAULT }, - { 3, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR }, + { 3, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT }, { 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 }, @@ -993,6 +993,8 @@ { 3, ALARM_ID_HD_INVALID_SERIAL_NUMBER }, { 3, ALARM_ID_DG_CPU_RAM_ERROR }, { 3, ALARM_ID_HD_CPU_RAM_ERROR }, + { 3, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, + { 3, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1057,8 +1059,6 @@ { 899, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 }, { 899, ALARM_ID__AVAILABLE_4 }, { 900, ALARM_ID_EMPTY_SALINE_BAG }, - { 901, ALARM_ID__AVAILABLE_9 }, - { 902, ALARM_ID__AVAILABLE_10 }, { 903, ALARM_ID_TREATMENT_STOPPED_BY_USER }, { 904, ALARM_ID_END_OF_TREATMENT_WARNING }, { 905, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY },