Index: AlarmDefs.h =================================================================== diff -u -r16be30843920c2404a621fd7ae03316d31c147b2 -rf58193c52ffef3b7b7e69df49a61e5714f102bcc --- AlarmDefs.h (.../AlarmDefs.h) (revision 16be30843920c2404a621fd7ae03316d31c147b2) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f58193c52ffef3b7b7e69df49a61e5714f102bcc) @@ -455,16 +455,16 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_HD_RTC_BATTERY_LOW, 0, ALARM_ID_NO_ALARM }, { 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___AVAILABLE_7, 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___AVAILABLE_7, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 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___AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_2, 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_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 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 }, @@ -606,8 +606,8 @@ { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD___AVAILABLE_9, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD___AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD___AVAILABLE_9, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD___AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -628,9 +628,9 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE, 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_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___AVAILABLE_8, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD___AVAILABLE_8, 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_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 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_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 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,13 @@ { 1, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD___AVAILABLE_7 }, - { 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___AVAILABLE_1 }, { 1, ALARM_ID___AVAILABLE_2 }, { 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_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 }, @@ -953,6 +951,8 @@ { 3, ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON }, { 3, ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON }, { 3, ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC }, + { 3, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE }, + { 3, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -989,8 +989,6 @@ { 799, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 799, ALARM_ID_HD___AVAILABLE_8 }, { 799, ALARM_ID_DG_SOFTWARE_FAULT }, - { 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 }, @@ -1004,6 +1002,8 @@ { 799, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, { 799, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE }, { 799, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE }, + { 799, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, + { 799, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM },