Index: AlarmDefs.h =================================================================== diff -u -rbecfbc4d11de64248085cde7f064d4e1cf63f978 -r0c85a1e49d745b917f3b29674392e6d7e022f39d --- AlarmDefs.h (.../AlarmDefs.h) (revision becfbc4d11de64248085cde7f064d4e1cf63f978) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 0c85a1e49d745b917f3b29674392e6d7e022f39d) @@ -152,10 +152,10 @@ ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114, ///< HD venous air bubble detector self-test failure ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115, ///< DG temperature sensor out of range ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116, ///< DG temperature sensor ADC out of range - ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117, ///< DG primary heater internal temperature out of range - ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118, ///< DG primary heater cold junction temperature out of range - ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119, ///< DG trimmer heater internal temperature out of range - ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120, ///< DG trimmer heater cold junction temperature out of range + ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117, ///< DG primary heater internal temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118, ///< DG primary heater cold junction temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119, ///< DG trimmer heater internal temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120, ///< DG trimmer heater cold junction temperature out of range // TODO remove when DEN-11750 was merged ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 121, ///< DG main primary heater voltage out of range ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 122, ///< DG small primary heater voltage out of range ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE = 123, ///< DG trimmer heater voltage out of range @@ -185,14 +185,14 @@ ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 147, ///< DG dialysate generation conductivity fault alarm 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_HIGH_CONDUCTIVITY = 150, ///< Inlet water conductivity too high + 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_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 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_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 157, ///< Inlet water temperature is not within specified range 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 @@ -595,17 +595,17 @@ { ALARM_PRIORITY_HIGH, 22, FALSE, FALSE, TRUE , TRUE , FALSE, 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, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 26, FALSE, FALSE, TRUE , FALSE, 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, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 26, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 28, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_HIGH, 30, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 32, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 30, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 32, FALSE, FALSE, TRUE , 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, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_PRESSURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, TRUE , FALSE, 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, 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, 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, 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, TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, 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, 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, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, @@ -633,7 +633,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , 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, 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 , TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, TRUE, TRUE, TRUE , FALSE, 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, 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 , TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP1_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -926,14 +926,14 @@ { 24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT }, { 26, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE }, { 28, ALARM_ID_INLET_WATER_LOW_TEMPERATURE }, - { 30, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY }, + { 30, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE }, { 32, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY }, { 34, ALARM_ID_INLET_WATER_LOW_PRESSURE }, { 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____AVAILABLE_23 }, + { 799, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE }, { 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 },