Index: AlarmDefs.h =================================================================== diff -u -r242bae1346554fbd1413cf9ee1cefda02abfb285 -rdba5f9431a29949d695ba33b5dd2d08427677f44 --- AlarmDefs.h (.../AlarmDefs.h) (revision 242bae1346554fbd1413cf9ee1cefda02abfb285) +++ AlarmDefs.h (.../AlarmDefs.h) (revision dba5f9431a29949d695ba33b5dd2d08427677f44) @@ -99,7 +99,7 @@ ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE = 61, ///< HD valve current out of range ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE = 62, ///< HD valve position out of target ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT = 63, ///< HD blood leak FPGA fault - ALARM_ID__AVAILABLE_14 = 64, ///< Alarm ID availabl + ALARM_ID_DG_BARO_PRESSURE_OUT_OF_RANGE = 64, ///< DG barometric pressure sensor out of range ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65, ///< HD requests DG command with invalid parameter fault ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE = 66, ///< HD blood leak sensor set point set failure ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67, ///< HD blood pump occlusion self-test failure alarm @@ -119,9 +119,9 @@ ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR = 81, ///< HD syringe pump over travel error ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR = 82, ///< HD syringe pump DAC write failure ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR = 83, ///< HD syringe pump is running while the BP is off - ALARM_ID__AVAILABLE_12 = 84, ///< Alarm ID available + ALARM_ID_DG_SET_RTC_YEAR_INVALID = 84, ///< DG set RTC year is invalid ALARM_ID_PUMP_TRACK_LATCH_OPENED = 85, ///< HD pump track latch opened alarm - ALARM_ID__AVAILABLE_17 = 86, ///< Alarm ID available + ALARM_ID_HD_SET_RTC_YEAR_INVALID = 86, ///< HD set RTC year is invalid ALARM_ID_DG_HEATING_INVALID_CAL_RECORD = 87, ///< DG heating invalid calibration record ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 88, ///< DG concentrate pumps hall sensor out of range ALARM_ID__AVAILABLE_15 = 89, ///< Alarm ID available @@ -204,7 +204,7 @@ ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 166, ///< HD in treatment re-circ sub-mode for too long ALARM_ID_CARTRIDGE_DOOR_OPENED = 167, ///< HD cartridge door opened alarm ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT = 168, ///< HD active reservoir depletion timeout. - ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE = 169, ///< Dialysate flow rate out of range + ALARM_ID_DG_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE = 169, ///< DG Dialysate flow rate out of maximum range ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 170, ///< HD syringe empty alarm ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 171, ///< HD syringe pump occlusion alarm ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 172, ///< HD syringe pump not enough Heparin alarm @@ -215,7 +215,7 @@ ALARM_ID_DG_SOFTWARE_FAULT = 177, ///< DG software fault. Software found itself in an unexpected state ALARM_ID_HD_COMM_TIMEOUT = 178, ///< HD communication timeout ALARM_ID_DG_FPGA_COMM_TIMEOUT = 179, ///< DG FPGA communication down for too long - ALARM_ID__AVAILABLE_13 = 180, ///< Alarm ID available for use + ALARM_ID_DG_RO_FLOW_RATE_OUT_OF_MAX_RANGE = 180, ///< DG RO flow out of maximum range ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 181, ///< DG load cells weight out of range for tare ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD = 182, ///< DG load cells invalid calibration ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 183, ///< DG invalid load cell value @@ -526,7 +526,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_14, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_BARO_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -547,9 +547,9 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_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_DAC_WRITE_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_RUNNING_WHILE_BP_OFF_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_SET_RTC_YEAR_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PUMP_TRACK_LATCH_OPENED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SET_RTC_YEAR_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_15, 0, ALARM_ID_NO_ALARM }, @@ -608,7 +608,7 @@ { ALARM_PRIORITY_HIGH, 19, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { 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_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 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 }, @@ -635,7 +635,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_CARTRIDGE_DOOR_OPENED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, 0, ALARM_ID_NO_ALARM }, @@ -647,7 +647,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RO_FLOW_RATE_OUT_OF_MAX_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_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, @@ -824,6 +824,8 @@ { 1, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC }, + { 1, ALARM_ID_DG_SET_RTC_YEAR_INVALID }, + { 1, ALARM_ID_HD_SET_RTC_YEAR_INVALID }, { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_HD_SOFTWARE_FAULT }, @@ -860,7 +862,7 @@ { 3, ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE }, { 3, ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT }, - { 3, ALARM_ID__AVAILABLE_14 }, + { 3, ALARM_ID_DG_BARO_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT }, { 3, ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE }, { 3, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, @@ -879,8 +881,6 @@ { 3, ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR }, - { 3, ALARM_ID__AVAILABLE_12 }, - { 3, ALARM_ID__AVAILABLE_17 }, { 3, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD }, { 3, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID__AVAILABLE_15 }, @@ -946,15 +946,15 @@ { 3, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME }, { 3, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, - { 3, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE }, { 3, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE }, { 3, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE }, { 3, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, { 3, ALARM_ID_DRAIN_PUMP_OFF_FAULT }, { 3, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, { 3, ALARM_ID_DG_CD1_CD2_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_DG_CPI_CPO_SENSORS_FPGA_FAULT }, - { 3, ALARM_ID__AVAILABLE_13 }, + { 3, ALARM_ID_DG_RO_FLOW_RATE_OUT_OF_MAX_RANGE }, { 3, ALARM_ID_DG_FPGA_COMM_TIMEOUT }, { 3, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT }, { 3, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT },