Index: AlarmDefs.h =================================================================== diff -u -r5550d0b88a5c5686b920ce0f71e60eb9e3e214b6 -r3866a71882e70f5afb1e6e94865522f35c05388f --- AlarmDefs.h (.../AlarmDefs.h) (revision 5550d0b88a5c5686b920ce0f71e60eb9e3e214b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3866a71882e70f5afb1e6e94865522f35c05388f) @@ -184,10 +184,10 @@ ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range 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_INLET_WATER_LOW_TEMPERATURE = 149, ///< Inlet water temperature too low - ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE = 150, ///< Inlet water conductivity is in warning range - ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY = 151, ///< Inlet water conductivity too low - ALARM_ID_INLET_WATER_LOW_PRESSURE = 152, ///< Inlet water pressure too low + ALARM_ID____AVAILABLE_28 = 149, ///< Alarm ID available for use + 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 ALARM_ID_PRIME_COMPLETED_HIGH = 153, ///< HD prime completed high priority alarm 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 @@ -541,7 +541,7 @@ { 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 }, - { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_STALL, 0, ALARM_ID_NO_ALARM }, @@ -595,18 +595,18 @@ { 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, 23, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 26, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, 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, TRUE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, 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, TRUE, ALARM_ID____AVAILABLE_28, 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_LOW, 30, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 32, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 34, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_PRESSURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 30, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 32, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE, FALSE, FALSE, 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, FALSE, FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, { 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, 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_LOW, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 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, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_26, 0, ALARM_ID_NO_ALARM }, @@ -654,10 +654,10 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BAD_INLET_WATER_QUALITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_PRESSURE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRESSURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RO_REJECTION_RATIO_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_CONDUCTIVITY_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED, 0, ALARM_ID_NO_ALARM }, @@ -731,7 +731,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, 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_BP_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_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_DIALYSATE_DRAIN_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, @@ -909,6 +909,11 @@ { 3, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT }, { 3, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { 3, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE }, + { 3, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE }, + { 3, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE }, + { 3, ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE }, + { 3, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -932,16 +937,13 @@ { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, { 23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE }, { 24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, - { 26, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE }, - { 28, ALARM_ID_INLET_WATER_LOW_TEMPERATURE }, - { 30, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE }, - { 32, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY }, - { 34, ALARM_ID_INLET_WATER_LOW_PRESSURE }, + { 28, ALARM_ID____AVAILABLE_28 }, + { 30, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE }, + { 32, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE }, { 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_INLET_WATER_TEMPERATURE_IN_LOW_RANGE }, { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, { 799, ALARM_ID____AVAILABLE_26 }, @@ -984,10 +986,8 @@ { 799, ALARM_ID_DG_BAD_INLET_WATER_QUALITY }, { 799, ALARM_ID_INLET_WATER_PRESSURE_FAULT }, { 799, ALARM_ID_PRESSURE_SENSOR_FAULT }, - { 799, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE }, { 799, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT }, { 799, ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME }, - { 799, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE }, { 799, ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT }, { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED },