Index: AlarmDefs.h =================================================================== diff -u -r23efa18cd165e3ee07c49920c0e09e9dee2bfdd0 -r082d844bfaf893d5298b98fcd5dad43b4dbe6544 --- AlarmDefs.h (.../AlarmDefs.h) (revision 23efa18cd165e3ee07c49920c0e09e9dee2bfdd0) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 082d844bfaf893d5298b98fcd5dad43b4dbe6544) @@ -84,7 +84,7 @@ AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46, ///< Last disinfection date CRC error ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47, ///< Pressure at outlet of RO pump is out of range ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48, ///< DG temperature sensors fault - ALARM_ID_FPGA_COMM_TIMEOUT = 49, ///< FPGA communication down for too long + ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49, ///< HD FPGA communication down for too long ALARM_ID_HD_COMM_TIMEOUT = 50, ///< HD communication timeout ALARM_ID_VALVE_CONTROL_FAILURE = 51, ///< FPGA not accepting commanded valve states ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52, ///< Blood pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed @@ -231,6 +231,8 @@ ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR = 193, ///< HD syringe pump is running while the BP is off ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 194, ///< DG chemical disinfect inlet pressure and temperature sensors out of range ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 195, ///< DG chemical disinfect inlet conductivity and temperature out of range + ALARM_ID_DG_FPGA_COMM_TIMEOUT = 196, ///< DG FPGA communication down for too long + ALARM_ID_DG_LOAD_CELL_ADC_ERROR = 197, ///< DG load cell ADC error NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -397,7 +399,7 @@ { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE - { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_FPGA_COMM_TIMEOUT + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_HD_FPGA_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_VALVE_CONTROL_FAILURE { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK @@ -544,6 +546,8 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_DG_FPGA_COMM_TIMEOUT + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_DG_LOAD_CELL_ADC_ERROR // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck };