Index: AlarmDefs.h =================================================================== diff -u -r5dfb15bed4f3fbe998f7bc693a3bdd125becea99 -rc52b290dba04f1e1b0e92c5edd3f86651fd45cbc --- AlarmDefs.h (.../AlarmDefs.h) (revision 5dfb15bed4f3fbe998f7bc693a3bdd125becea99) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c52b290dba04f1e1b0e92c5edd3f86651fd45cbc) @@ -54,7 +54,7 @@ ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE = 16, ///< HD alarm audio failed POST ALARM_ID_HD_UI_POST_FAILED = 17, ///< HD UI POST failed ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD = 18, ///< DG load cells invalid calibration record - ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD = 19, ///< DG flow sensors invalid calibration record + ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD = 19, // TODO remove when DEN-12931 is merged ///< DG flow sensors invalid calibration record ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD = 20, ///< DG conductivity sensors invalid calibration record ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD = 21, ///< DG drain line volume invalid calibration record ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD = 22, ///< DG reservoirs invalid calibration record @@ -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_12 = 106, ///< Unused - alarm ID is available + ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD = 106, ///< DG dialysate flow sensor invalid calibration record 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 @@ -179,7 +179,7 @@ ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 141, ///< Air trap fill timeout during treatment ALARM_ID_OCCLUSION_BLOOD_PUMP = 142, ///< Blood pump occlusion detected ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE = 143, ///< DG dialysate temperature sensors out of range - ALARM_ID__AVAILABLE_5 = 144, ///< Alarm ID available for use + ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD = 144, ///< DG RO flow sensor invalid calibration record ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 145, ///< Concentrate conductivity after adding acid out of range alarm ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE = 146, ///< DG RTC or timer accuracy failure. ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT = 147, ///< Wait for the DG to produce dialysate @@ -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__AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD, 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 }, @@ -594,7 +594,7 @@ { ALARM_PRIORITY_HIGH, 20, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_OCCLUSION_BLOOD_PUMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, 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, TRUE , FALSE, TRUE , ALARM_ID__AVAILABLE_5, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, @@ -796,6 +796,8 @@ { 1, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC }, { 1, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE }, { 1, ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE }, + { 1, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD }, + { 1, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD }, { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_HD_SOFTWARE_FAULT }, @@ -869,7 +871,6 @@ { 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__AVAILABLE_12 }, { 3, ALARM_ID_DG_RESTARTED_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR }, @@ -969,7 +970,6 @@ { 19, ALARM_ID_DG_COMM_TIMEOUT }, { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, - { 21, ALARM_ID__AVAILABLE_5 }, { 36, ALARM_ID_PRIME_COMPLETED_HIGH }, { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE }, { 799, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE },