Index: AlarmDefs.h =================================================================== diff -u -rad4dc107b858032c4f3a8fdf6181e7c9213a4ab8 -r7a57d9836f752e34f98e6a359e85b82cb15a0dd0 --- AlarmDefs.h (.../AlarmDefs.h) (revision ad4dc107b858032c4f3a8fdf6181e7c9213a4ab8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 7a57d9836f752e34f98e6a359e85b82cb15a0dd0) @@ -129,7 +129,7 @@ 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_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE = 93, ///< DG outlet primary conductivity out of range - ALARM_ID____AVAILABLE_16 = 94, ///< This alarm ID is available for use + ALARM_ID_DG_PRESSURE_OUT_OF_RANGE = 94, ///< DG pressure out of range ALARM_ID____AVAILABLE_17 = 95, ///< 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 @@ -181,7 +181,7 @@ ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE = 143, ///< DG dialysate temperature sensors out of range 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____AVAILABLE_34 = 146, ///< Alarm ID available for use + ALARM_ID____AVAILABLE_34 = 146, ///< This alarm ID is available for use 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____AVAILABLE_28 = 149, ///< Alarm ID available for use @@ -237,7 +237,7 @@ ALARM_ID_DG_HEATERS_FAULT = 199, ///< DG heaters fault ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 200, ///< DG thermistors/sensors temperature out of range ALARM_ID____AVAILABLE_29 = 201, ///< This alarm ID is available for use - ALARM_ID_INLET_WATER_PRESSURE_FAULT = 202, ///< Inlet water pressure fault + ALARM_ID____AVAILABLE_35 = 202, ///< This alarm ID is available for use ALARM_ID_PRESSURE_SENSOR_FAULT = 203, ///< Pressure sensor fault ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 204, ///< RO rejection ratio out of range ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 205, ///< Conductivity sensor fault @@ -537,9 +537,9 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , 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_DG_LOAD_CELL_FPGA_READ_ERROR, 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 , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_PRIMARY_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____AVAILABLE_16, 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 , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_PRIMARY_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_PRESSURE_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____AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , 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, TRUE, TRUE , ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -633,7 +633,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , FALSE, 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, 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, 3, FALSE, TRUE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , 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, 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 }, { 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 }, @@ -652,10 +652,10 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEATERS_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_29, 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____AVAILABLE_35, 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, 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, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , FALSE, 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_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_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT, 0, ALARM_ID_NO_ALARM }, @@ -852,7 +852,7 @@ { 3, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE }, { 3, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS }, { 3, ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE }, - { 3, ALARM_ID____AVAILABLE_16 }, + { 3, ALARM_ID_DG_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID____AVAILABLE_17 }, { 3, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BATTERY_COMM_FAULT }, @@ -925,6 +925,7 @@ { 3, ALARM_ID_DG_FPGA_COMM_TIMEOUT }, { 3, ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT }, { 3, ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT }, + { 3, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -982,9 +983,8 @@ { 799, ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE }, { 799, ALARM_ID_DG_HEATERS_FAULT }, { 799, ALARM_ID____AVAILABLE_29 }, - { 799, ALARM_ID_INLET_WATER_PRESSURE_FAULT }, + { 799, ALARM_ID____AVAILABLE_35 }, { 799, ALARM_ID_PRESSURE_SENSOR_FAULT }, - { 799, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT }, { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT },