Index: AlarmDefs.h =================================================================== diff -u -r2bcd3d4ee5c4d58cdb6827f651af82ac8ab46272 -r94be3a1a3e35ac04a57e8ba17999e61eea555d6f --- AlarmDefs.h (.../AlarmDefs.h) (revision 2bcd3d4ee5c4d58cdb6827f651af82ac8ab46272) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 94be3a1a3e35ac04a57e8ba17999e61eea555d6f) @@ -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, 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 @@ -552,7 +552,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , 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 , 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 , 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 , 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, TRUE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , 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 , 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 , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -864,7 +864,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 },