Index: AlarmDefs.h =================================================================== diff -u -rb4d166aff4b22187845b0fe5296b89cce07d92b7 -r0b462b3c2c163c5abc02566bcaa0e0e680a5b7b8 --- AlarmDefs.h (.../AlarmDefs.h) (revision b4d166aff4b22187845b0fe5296b89cce07d92b7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 0b462b3c2c163c5abc02566bcaa0e0e680a5b7b8) @@ -8,7 +8,7 @@ * @file AlarmDefs.h * * @author (last) Dara Navaei -* @date (last) 21-Mar-2022 +* @date (last) 15-Feb-2022 * * @author (original) Sean * @date (original) 11-Feb-2020 @@ -131,8 +131,8 @@ 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 - ALARM_ID____AVAILABLE_18 = 96, ///< This alarm ID is available for use - ALARM_ID____AVAILABLE_19 = 97, ///< This alarm ID is available for use + ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE = 96, ///< Inlet water temperature in high range + ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE = 97, ///< Fill conductivity out of range ALARM_ID_HD_BATTERY_COMM_FAULT = 98, ///< HD battery communication fault ALARM_ID_HD_SYRINGE_PUMP_STALL = 99, ///< HD syringe pump stall alarm ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100, ///< HD no cartridge self-test timeout @@ -141,7 +141,7 @@ ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD non-volatile calibration group invalid record CRC ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104, ///< Air trap level sensors reporting illegal combination of air/fluid ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG non-volatile system group invalid record CRC - ALARM_ID____AVAILABLE_20 = 106, ///< This alarm ID is available for use + ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 106, ///< DG inlet water conductivity is greater than threshold ALARM_ID_DG_RESTARTED_FAULT = 107, ///< HD reports DG restarted fault ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108, ///< HD syringe pump ADC error ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109, ///< HD syringe pump volume check error @@ -182,18 +182,18 @@ ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC = 144, ///< DG software configuration record invalid CRC. ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 145, ///< Concentrate conductivity after adding acid out of range alarm ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range - ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 147, ///< DG dialysate generation conductivity fault alarm + 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_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_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_INLET_WATER_TEMPERATURE_IN_LOW_RANGE = 158, ///< Inlet water temperature is in the low range 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 ALARM_ID____AVAILABLE_26 = 161, ///< This alarm ID is available for use @@ -541,8 +541,8 @@ { 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, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_18, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_19, 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 , 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 }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To @@ -552,7 +552,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_20, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESTARTED_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_ADC_ERROR, 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_VOLUME_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -594,19 +594,29 @@ { 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, 22, FALSE, FALSE, 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 }, +<<<<<<< HEAD + { 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 }, + // 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_HIGH, 24, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT, 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, 3, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE, 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, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_PRESSURE, 0, ALARM_ID_NO_ALARM }, +>>>>>>> b4d166aff4b22187845b0fe5296b89cce07d92b7 { 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_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, 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, 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 }, @@ -638,7 +648,7 @@ { 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 }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP1_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP2_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_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_DRAIN_PUMP_OFF_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -691,15 +701,15 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { 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, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_BICARB_CONDUCTIVITY_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_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, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT, 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_HIGH, 3, FALSE, TRUE, 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, 3, 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_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 @@ -854,8 +864,8 @@ { 3, ALARM_ID____AVAILABLE_15 }, { 3, ALARM_ID____AVAILABLE_16 }, { 3, ALARM_ID____AVAILABLE_17 }, - { 3, ALARM_ID____AVAILABLE_18 }, - { 3, ALARM_ID____AVAILABLE_19 }, + { 3, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE }, + { 3, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BATTERY_COMM_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_STALL }, { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT }, @@ -864,7 +874,7 @@ { 3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS }, { 3, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, - { 3, ALARM_ID____AVAILABLE_20 }, + { 3, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY }, { 3, ALARM_ID_DG_RESTARTED_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR }, @@ -940,12 +950,21 @@ { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, { 22, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { 23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE }, +<<<<<<< HEAD + { 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 }, +======= { 24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT }, +>>>>>>> b4d166aff4b22187845b0fe5296b89cce07d92b7 { 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_24 }, + { 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 },