Index: AlarmDefs.h =================================================================== diff -u -rb27c502ee091cdb00484bb482ed68ac847ae3192 -r57bd0e5ceea2b85d201495f0d2dfe955bd4890d9 --- AlarmDefs.h (.../AlarmDefs.h) (revision b27c502ee091cdb00484bb482ed68ac847ae3192) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 57bd0e5ceea2b85d201495f0d2dfe955bd4890d9) @@ -127,7 +127,7 @@ ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error ALARM_ID____AVAILABLE_25 = 90, ///< This alarm ID is available for use ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE = 91, ///< HD No dialysate flow data receive in the last 3 seconds - ALARM_ID____AVAILABLE_14 = 92, ///< This alarm ID is available for use + ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS = 92, ///< DG conductivity sensor bad status. ALARM_ID____AVAILABLE_15 = 93, ///< This alarm ID is available for use ALARM_ID____AVAILABLE_16 = 94, ///< This alarm ID is available for use ALARM_ID____AVAILABLE_17 = 95, ///< This alarm ID is available for use @@ -192,7 +192,7 @@ ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154, ///< EEPROM operations (read, write, erase) failure ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155, ///< DG software configuration record invalid CRC ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156, ///< HW usage data (treatment time in HD and total consumed water in DG) failure - ALARM_ID____AVAILABLE_23 = 157, ///< This alarm ID is available for use + ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT = 157, ///< DG chemical disinfect prime acid line timeout. ALARM_ID____AVAILABLE_24 = 158, ///< This alarm ID is available for use ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159, ///< Dialysate inlet pump failed flow vs. motor speed check. ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160, ///< Blood pump rotor speed too high @@ -537,7 +537,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_25, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_14, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_15, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_16, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, @@ -605,7 +605,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, 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, FALSE, FALSE, TRUE, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23, 0, ALARM_ID_NO_ALARM }, + { 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_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_24, 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 }, @@ -632,7 +632,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , 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 , TRUE , 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, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, 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_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE, TRUE , FALSE, 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 }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -692,16 +692,16 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_NO_CARTRIDGE_LOADED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 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, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, @@ -850,7 +850,7 @@ { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, { 3, ALARM_ID____AVAILABLE_25 }, { 3, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE }, - { 3, ALARM_ID____AVAILABLE_14 }, + { 3, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS }, { 3, ALARM_ID____AVAILABLE_15 }, { 3, ALARM_ID____AVAILABLE_16 }, { 3, ALARM_ID____AVAILABLE_17 }, @@ -900,6 +900,13 @@ { 3, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, { 3, ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, + { 3, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT }, + { 3, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, + { 3, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -933,7 +940,6 @@ { 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____AVAILABLE_23 }, { 799, ALARM_ID____AVAILABLE_24 }, { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, @@ -960,7 +966,6 @@ { 799, ALARM_ID_DG_LOAD_CELL_ADC_ERROR }, { 799, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE }, { 799, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION }, - { 799, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE }, { 799, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, { 799, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT }, { 799, ALARM_ID_CP1_SPEED_CONTROL_ERROR }, @@ -986,8 +991,6 @@ { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT }, - { 799, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT }, - { 799, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 799, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION }, @@ -1024,13 +1027,10 @@ { 999, ALARM_ID_NO_CARTRIDGE_LOADED }, { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE }, { 999, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE }, - { 999, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE }, { 999, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT }, { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT }, { 999, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, - { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, - { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT }, { 999, ALARM_ID_UI_POST_FAILURE_WIFI }, { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET },