Index: AlarmDefs.h =================================================================== diff -u -r6aac2df66cef38fbb6722289c5575af2d92e66e3 -rd90749bcc813b63f62cb7d1a8e927cfcc516d507 --- AlarmDefs.h (.../AlarmDefs.h) (revision 6aac2df66cef38fbb6722289c5575af2d92e66e3) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d90749bcc813b63f62cb7d1a8e927cfcc516d507) @@ -184,7 +184,7 @@ 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 ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 148, ///< Inlet water temperature too high - ALARM_ID____AVAILABLE_28 = 149, ///< Alarm ID available for use + ALARM_ID_PRE_TREATMENT_WET_PRIME_TEST_FAILURE = 149, ///< HD pre-treatment mode wet self-test prime check failure ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE = 150, ///< Inlet water conductivity in high range ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE = 151, ///< Inlet water conductivity in low range ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE = 152, ///< Inlet water pressure in low range @@ -236,8 +236,8 @@ ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 198, ///< DG heaters cold junction temperature out of range // TODO remove when DEN-12224 merged ALARM_ID_DG_HEATERS_FAULT = 199, ///< DG heaters fault ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 200, ///< DG thermistors/sensors temperature out of range - ALARM_ID____AVAILABLE_29 = 201, ///< This alarm ID is available for use - ALARM_ID____AVAILABLE_35 = 202, ///< This alarm ID is available for use + ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE = 201, ///< HD pre-treatment mode wet self-test lc vs FMD failure + ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE = 202, ///< HD pre-treatment mode dry pressure normal self-test failure ALARM_ID_PRESSURE_SENSOR_FAULT = 203, ///< Pressure sensor fault ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 204, ///< RO rejection ratio out of range ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 205, ///< Conductivity sensor fault @@ -266,8 +266,8 @@ ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT = 228, ///< HD time out on prime sub-mode purge air state. ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 229, ///< HD prime dialysate dialyzer time out alarm ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 230, ///< HD prime dialysate bypass time out alarm - ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 231, ///< HD pre-treatment mode dry self-tests failure - ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 232, ///< HD pre-treatment mode wet self-tests failure + ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE = 231, ///< HD pre-treatment mode dry pressure self-test failure + ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE = 232, ///< HD pre-treatment mode wet self-test LC vs. LC failure ALARM_ID_RTC_BATTERY_LOW = 233, // TODO remove when DEN-12224 merged ///< RTC battery low ALARM_ID_RTC_RAM_OPS_ERROR = 234, ///< RTC (i.e read time) or RAM operations failure (read or write) ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 235, ///< HD in treatment stopped sub-mode after rinseback completed (no escalation) @@ -596,7 +596,7 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, TRUE, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE, 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, FALSE, 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, FALSE, ALARM_ID____AVAILABLE_28, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_PRIME_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -619,7 +619,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, 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 , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 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, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK, 0, ALARM_ID_NO_ALARM }, @@ -651,8 +651,8 @@ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEATERS_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_29, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_35, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, 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, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -682,8 +682,8 @@ { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_RTC_BATTERY_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_RTC_RAM_OPS_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK, 0, ALARM_ID_NO_ALARM }, @@ -955,7 +955,6 @@ { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, { 24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, - { 28, ALARM_ID____AVAILABLE_28 }, { 36, ALARM_ID_PRIME_COMPLETED_HIGH }, { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE }, { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC }, @@ -983,8 +982,6 @@ { 799, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE }, { 799, ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE }, { 799, ALARM_ID_DG_HEATERS_FAULT }, - { 799, ALARM_ID____AVAILABLE_29 }, - { 799, ALARM_ID____AVAILABLE_35 }, { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, @@ -1016,8 +1013,11 @@ { 909, ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT }, { 909, ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT }, { 909, ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT }, - { 910, ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE }, - { 910, ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE }, + { 910, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, + { 910, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE }, + { 910, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE }, + { 910, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE }, + { 910, ALARM_ID_PRE_TREATMENT_WET_PRIME_TEST_FAILURE }, { 999, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE }, { 999, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE }, { 999, ALARM_ID_RTC_BATTERY_LOW },