Index: AlarmDefs.h =================================================================== diff -u -r4a44bcee0dd1be5fde235fb8844749857c00ab55 -ra94b3fe34be7d13eb43a5c3ff0ed0d9bdbf52150 --- AlarmDefs.h (.../AlarmDefs.h) (revision 4a44bcee0dd1be5fde235fb8844749857c00ab55) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a94b3fe34be7d13eb43a5c3ff0ed0d9bdbf52150) @@ -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_INLET_WATER_HIGH_CONDUCTIVITY = 106, ///< DG inlet water conductivity is greater than threshold + ALARM_ID__AVAILABLE_12 = 106, ///< Unused - alarm ID is available 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 @@ -555,7 +555,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, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_12, 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 }, @@ -647,7 +647,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, @@ -870,7 +870,7 @@ { 3, ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE }, { 3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS }, - { 3, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY }, + { 3, ALARM_ID__AVAILABLE_12 }, { 3, ALARM_ID_DG_RESTARTED_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR }, @@ -945,6 +945,7 @@ { 3, ALARM_ID_HD_RTC_CONFIG_ERROR }, { 3, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, + { 3, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -983,7 +984,6 @@ { 799, ALARM_ID_DG_SOFTWARE_FAULT }, { 799, ALARM_ID_HD_COMM_TIMEOUT }, { 799, ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE }, - { 799, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE }, { 799, ALARM_ID__AVAILABLE_10 }, { 799, ALARM_ID_DG_HEATERS_FAULT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, Index: DGDefs.h =================================================================== diff -u -r42d796b7a65b8cb96457dd099589ff0dfb1030e1 -ra94b3fe34be7d13eb43a5c3ff0ed0d9bdbf52150 --- DGDefs.h (.../DGDefs.h) (revision 42d796b7a65b8cb96457dd099589ff0dfb1030e1) +++ DGDefs.h (.../DGDefs.h) (revision a94b3fe34be7d13eb43a5c3ff0ed0d9bdbf52150) @@ -123,7 +123,7 @@ enum DG_Standby_Mode_States { DG_STANDBY_MODE_STATE_START = 0, ///< Start standby mode state - DG_STANDBY_MODE_STATE_IDLE, ///< Idle standby mode state + DG_STANDBY_MODE_STATE_IDLE, ///< Idle standby mode state // TODO remove when DEN-12931 merged DG_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state DG_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state