Index: AlarmDefs.h =================================================================== diff -u -r5a6960eabd099c0138d9d8efbb8833589098d72a -r5b1a24152d17c8d690bc81d100eaf9ed80c4609c --- AlarmDefs.h (.../AlarmDefs.h) (revision 5a6960eabd099c0138d9d8efbb8833589098d72a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 5b1a24152d17c8d690bc81d100eaf9ed80c4609c) @@ -184,7 +184,7 @@ ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE = 146, ///< DG RTC or timer accuracy failure. ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT = 147, ///< Wait for the DG to produce dialysate ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 148, ///< Inlet water temperature too high - ALARM_ID____AVAILABLE_28 = 149, ///< Alarm ID available for use + ALARM_ID_HD_WATCHDOG_EXPIRED = 149, ///< HD watchdog expired ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE = 150, ///< Inlet water conductivity in high range ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE = 151, ///< Inlet water conductivity in low range ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE = 152, ///< Inlet water pressure in low range @@ -592,11 +592,11 @@ { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_OCCLUSION_BLOOD_PUMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 21, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, TRUE, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 28, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_28, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -608,7 +608,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , 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, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM, 0, ALARM_ID_NO_ALARM }, @@ -624,14 +624,14 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, 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, 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 , TRUE , TRUE , 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, FALSE, FALSE, FALSE, ALARM_ID_HD_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_ADC_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -934,6 +934,9 @@ { 3, ALARM_ID_CP2_SPEED_CONTROL_ERROR }, { 3, ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS }, { 3, ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE }, + { 3, ALARM_ID_HD_WATCHDOG_EXPIRED }, + { 3, ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR }, + { 3, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -955,13 +958,11 @@ { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, { 24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, - { 28, ALARM_ID____AVAILABLE_28 }, { 36, ALARM_ID_PRIME_COMPLETED_HIGH }, { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE }, { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC }, { 799, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR }, { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, - { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, { 799, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM }, { 799, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM }, { 799, ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM }, @@ -974,7 +975,6 @@ { 799, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 799, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED }, { 799, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK }, - { 799, ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR }, { 799, ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH }, { 799, ALARM_ID_DG_SOFTWARE_FAULT }, { 799, ALARM_ID_HD_COMM_TIMEOUT },