Index: AlarmDefs.h =================================================================== diff -u -raa5056a58c26398a2bacc3639ac3a5538c978701 -r0b462b3c2c163c5abc02566bcaa0e0e680a5b7b8 --- AlarmDefs.h (.../AlarmDefs.h) (revision aa5056a58c26398a2bacc3639ac3a5538c978701) +++ 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 @@ -125,14 +125,14 @@ ALARM_ID_DG_HEATING_INVALID_CAL_RECORD = 87, ///< DG heating invalid calibration record ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 88, ///< DG concentrate pumps hall sensor out of range 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_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT = 90, ///< DG dialysate temperature sensor drift timeout. ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE = 91, ///< HD No dialysate flow data receive in the last 3 seconds 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 - 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 @@ -391,14 +391,14 @@ ALARM_STATE_FLAG_BIT_POS_NO_RESUME = 3, ///< The "resume" user recovery option is disabled ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK = 4, ///< The "rinseback" user recovery option is disabled ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT = 5, ///< The "end treatment" user recovery option is disabled - ALARM_STATE_FLAG_BIT_POS____AVAILABLE = 6, ///< Not used - available for use + ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 6, ///< Reserved ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY = 7, ///< The "ok" user recovery option is enabled ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE = 8, ///< One or more active alarms will escalate in time ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED = 9, ///< Alarms have been temporarily silenced by user ALARM_STATE_FLAG_BIT_POS_LAMP_ON = 10, ///< Alarm lamp is currently on (for syncing to UI) - ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 11, ///< Reserved - ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 12, ///< Reserved - ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 13, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 11, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 12, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC = 13, ///< Dialysate recirculation is diabled ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE = 14, ///< Prevent user from minimizing alarm window ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION = 15, ///< The top alarm's condition is still being detected NUM_OF_ALARM_STATE_FLAG_BIT_POS = 16 ///< The number of alarm state flag bit positions @@ -535,14 +535,14 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEATING_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_CONC_PUMP_HALL_SENSOR_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_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 , TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT, 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, 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, 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 }, - { 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 }, - { 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 }, +<<<<<<< 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_HIGH, 30, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 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_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 }, @@ -619,7 +629,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE ,FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, 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, 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 }, @@ -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, 799, 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, 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 }, @@ -654,9 +664,9 @@ { 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 , TRUE , 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, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE, TRUE, 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, 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 }, @@ -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, 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_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_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, 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 @@ -848,14 +858,14 @@ { 3, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD }, { 3, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, - { 3, ALARM_ID____AVAILABLE_25 }, + { 3, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT }, { 3, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE }, { 3, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS }, { 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 }, @@ -907,6 +917,16 @@ { 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 }, + { 3, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, + { 3, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY }, + { 3, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY }, + { 3, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE }, + { 3, ALARM_ID_INLET_WATER_LOW_TEMPERATURE }, + { 3, ALARM_ID_INLET_WATER_LOW_PRESSURE }, + { 3, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -930,17 +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 }, - { 24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT }, +<<<<<<< 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_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 }, +======= + { 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 }, @@ -970,7 +994,6 @@ { 799, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT }, { 799, ALARM_ID_CP1_SPEED_CONTROL_ERROR }, { 799, ALARM_ID_CP2_SPEED_CONTROL_ERROR }, - { 799, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, { 799, ALARM_ID_DRAIN_PUMP_OFF_FAULT }, { 799, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE }, { 799, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE }, @@ -983,15 +1006,12 @@ { 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 }, { 799, ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_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 }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, @@ -1030,7 +1050,6 @@ { 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_UI_POST_FAILURE_WIFI }, { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET },