Index: AlarmDefs.h =================================================================== diff -u -r30d3d5b6cf73c708c6d63fc321d73eade44d1b49 -r9f96945f9758e5dcf095ebb62bf43a01f58e72fb --- AlarmDefs.h (.../AlarmDefs.h) (revision 30d3d5b6cf73c708c6d63fc321d73eade44d1b49) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 9f96945f9758e5dcf095ebb62bf43a01f58e72fb) @@ -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_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range + 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 @@ -593,7 +593,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { 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, 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, 23, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID____AVAILABLE_34, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 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 }, @@ -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 }, @@ -655,7 +655,7 @@ { 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, 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 }, @@ -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 }, @@ -945,7 +946,7 @@ { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, - { 23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE }, + { 23, ALARM_ID____AVAILABLE_34 }, { 24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, { 28, ALARM_ID____AVAILABLE_28 }, { 36, ALARM_ID_PRIME_COMPLETED_HIGH }, @@ -984,7 +985,6 @@ { 799, ALARM_ID____AVAILABLE_29 }, { 799, ALARM_ID_INLET_WATER_PRESSURE_FAULT }, { 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 },