Index: AlarmDefs.h =================================================================== diff -u -ra5a95b57e41b5a85c6968159d762d5666061380a -rdb65d65709c7c0d8c82e32c3a01d25f5b8db22b6 --- AlarmDefs.h (.../AlarmDefs.h) (revision a5a95b57e41b5a85c6968159d762d5666061380a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision db65d65709c7c0d8c82e32c3a01d25f5b8db22b6) @@ -63,7 +63,7 @@ ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD = 25, ///< DG accelerometer invalid calibration record ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD = 26, ///< HD accelerometer invalid calibration record ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED = 27, ///< HD blood leak sensor zero and self test sequence failed - ALARM_ID_HD___AVAILABLE_4 = 28, ///< Not used - Available for use + ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT = 28, ///< DG two wire sensors FPGA fault ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD = 29, ///< HD heparin force sensor invalid calibration record ALARM_ID_HD_SOFTWARE_FAULT = 30, ///< HD Software fault. Software found itself in an unexpected state ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 31, ///< Blood pump failed motor controller current check. Too high when pump should be off or out of range when pump should be running @@ -232,7 +232,7 @@ ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 194, ///< DG RO pump duty cycle out of range ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 195, ///< DG RO pump pressure out of range ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT = 196, ///< DG temperature sensor error bit fault - ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT = 197, ///< DG temperature sensors FPGA fault + ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT = 197, // TODO remove when DEN-13460 was merged ///< DG temperature sensors FPGA fault ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON = 198, ///< RO flow too low while primary heater is on ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON = 199, ///< Dialysate flow too low while trimmer heater is on ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 200, ///< DG thermistors/sensors temperature out of range @@ -255,7 +255,7 @@ ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 217, ///< HD blood prime volume check failure ALARM_ID_HD_SYRINGE_DETECTED = 218, ///< HD syringe detected alarm ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 219, ///< HD syringe pump syringe removed alarm - ALARM_ID___AVAILABLE_1 = 220, ///< Not used - Available for use + 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_DIALYSATE_TEMPERATURE_HIGH = 222, // TODO remove when DEN-13460 merged ///< HD dialysate temperature too high alarm ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 223, // TODO remove when DEN-13460 merged ///< HD dialysate temperature too low alarm @@ -331,7 +331,9 @@ ALARM_ID_HD_DISINFECT_CHEM = 293, ///< HD processor is in Disinfect Chemical mode ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 = 294, ///< HD processor Disinfect Chemical mode instructions to user ALARM_ID_UI_POST_FAILURE_CLOUDSYNC = 295, ///< UI POST CloudSync failure - + ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT = 296, ///< DG TDi sensors FPGA fault + ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT = 297, ///< DG TRo sensors FPGA fault + ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT = 298, ///< DG baro sensor FPGA fault NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -480,7 +482,7 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD, 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_ZERO_SEQUENCE_FAILED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_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_HD_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -679,7 +681,7 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED, 0, ALARM_ID_NO_ALARM }, { 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_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH , 3, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, 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_DIALYSATE_TEMPERATURE_HIGH, 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_DIALYSATE_TEMPERATURE_LOW, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, @@ -758,6 +760,9 @@ { 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 }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TDI_SENSORS_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_TRO_SENSORS_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_BARO_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -785,7 +790,6 @@ { 1, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD }, - { 1, ALARM_ID_HD___AVAILABLE_4 }, { 1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { 1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED }, @@ -964,6 +968,11 @@ { 3, ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE }, { 3, ALARM_ID_HD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE }, { 3, ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED }, + { 3, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT }, + { 3, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT }, + { 3, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT }, + { 3, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT }, + { 3, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1023,7 +1032,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___AVAILABLE_1 }, { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 },