Index: AlarmDefs.h =================================================================== diff -u -re3e54ce50c30685e970dee6687bfe4c056cd7cac -rd1cac904e12deecc447bef13a28fd9090ea8c72e --- AlarmDefs.h (.../AlarmDefs.h) (revision e3e54ce50c30685e970dee6687bfe4c056cd7cac) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d1cac904e12deecc447bef13a28fd9090ea8c72e) @@ -208,7 +208,7 @@ 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 - ALARM_ID____AVAILABLE_1 = 173, ///< Alarm ID is available for use + ALARM_ID_HD_RTC_CONFIG_ERROR = 173, ///< HD RTC configuration error ALARM_ID____AVAILABLE_2 = 174, ///< Alarm ID is available for use ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 175, ///< HD pump direction status error ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH = 176, ///< HD active reservoir is full during treatment and DG not ready to switch reservoirs. // TODO remove this alarm @@ -598,7 +598,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, 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 , TRUE , TRUE , 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 }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -624,7 +624,7 @@ { 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 }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID____AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_HD_RTC_CONFIG_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID____AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -675,7 +675,7 @@ { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 901, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, + { ALARM_PRIORITY_LOW, 901, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_LOW, 902, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_DIALYSATE_TEMPERATURE_LOW, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_LOW, 903, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To @@ -941,6 +941,7 @@ { 3, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, { 3, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, { 3, ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON }, + { 3, ALARM_ID_HD_RTC_CONFIG_ERROR }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -975,7 +976,6 @@ { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 799, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION }, { 799, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, - { 799, ALARM_ID____AVAILABLE_1 }, { 799, ALARM_ID____AVAILABLE_2 }, { 799, ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH }, { 799, ALARM_ID_DG_SOFTWARE_FAULT },