Index: AlarmDefs.h =================================================================== diff -u -r0e35ca2221e177c2786fa883d13f2e2507f428df -rc6cd401b387f88b98788af0f3e88db30e1efda9e --- AlarmDefs.h (.../AlarmDefs.h) (revision 0e35ca2221e177c2786fa883d13f2e2507f428df) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c6cd401b387f88b98788af0f3e88db30e1efda9e) @@ -46,15 +46,15 @@ ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 8, ///< HD accelerometer failed POST ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 9, ///< DG accelerometer failed POST ALARM_ID_HD_BLOOD_LEAK_FAULT = 10, //TODO remove when DEN-12931 was merged ///< Alarm ID available for use - ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 11, //TODO remove when DEN-12931 was merged ///< Alarm ID available for use + ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP = 11, ///< HD dialysate temperature below target temperature ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION = 14, ///< HD blood flow invalid calibration ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION = 15, ///< HD dialysate flow invalid calibration ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE = 16, ///< HD alarm audio failed POST ALARM_ID_HD_UI_POST_FAILED = 17, ///< HD UI POST failed ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD = 18, ///< DG load cells invalid calibration record - ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD = 19, // TODO remove when DEN-12931 is merged ///< DG flow sensors invalid calibration record + ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP = 19, ///< HD dialysate temperature above target temperature. ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD = 20, ///< DG conductivity sensors invalid calibration record ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD = 21, ///< DG drain line volume invalid calibration record ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD = 22, ///< DG reservoirs invalid calibration record @@ -213,7 +213,7 @@ ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 175, ///< HD pump direction status error ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH = 176, ///< HD active reservoir is full during treatment and DG not ready to switch reservoirs. // TODO remove this alarm ALARM_ID_DG_SOFTWARE_FAULT = 177, ///< DG software fault. Software found itself in an unexpected state - ALARM_ID_HD_COMM_TIMEOUT = 178, // TODO remove when DEN-12931 is merged ///< HD communication timeout + ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE = 178, ///< HD dialysate temperature out of high safety range. ALARM_ID_DG_FPGA_COMM_TIMEOUT = 179, ///< DG FPGA communication down for too long ALARM_ID_DG_LOAD_CELL_ADC_ERROR = 180, ///< DG load cell ADC error ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 181, ///< DG load cells weight out of range for tare @@ -228,7 +228,7 @@ ALARM_ID_DRAIN_PUMP_OFF_FAULT = 190, ///< DG drain pump off fault ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE = 191, ///< DG flow rate out of upper range ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 192, ///< DG flow rate out of lower range - ALARM_ID__AVAILABLE_13 = 193, ///< Alarm available for use + ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE = 193, ///< HD dialysate temperature out of low safety range. 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 @@ -257,8 +257,8 @@ ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 219, ///< HD syringe pump syringe removed alarm ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW = 220, ///< HD battery pack SOC is too low. ALARM_ID_EMPTY_SALINE_BAG = 221, ///< HD Saline bag is empty - ALARM_ID_DIALYSATE_TEMPERATURE_HIGH = 222, ///< HD dialysate temperature too high alarm - ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 223, ///< HD dialysate temperature too low alarm + 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 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 @@ -456,15 +456,15 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_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_BLOOD_LEAK_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INTEGRITY_POST_TEST_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_BLOOD_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, 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, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, @@ -630,7 +630,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_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_FPGA_COMM_TIMEOUT, 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_ADC_ERROR, 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_CELLS_TARE_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -645,7 +645,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_OFF_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, 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_ERROR_BIT_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -761,15 +761,15 @@ { 1, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_BLOOD_LEAK_FAULT }, - { 1, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE }, + { 1, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION }, { 1, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION }, { 1, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_UI_POST_FAILED }, { 1, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD }, - { 1, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD }, + { 1, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, { 1, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD }, @@ -989,8 +989,8 @@ { 799, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 799, ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH }, { 799, ALARM_ID_DG_SOFTWARE_FAULT }, - { 799, ALARM_ID_HD_COMM_TIMEOUT }, - { 799, ALARM_ID__AVAILABLE_13 }, + { 799, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE }, + { 799, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE }, { 799, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT },