Index: AlarmDefs.h =================================================================== diff -u -r9e64bac640514113f61cec766b08452d7b39d753 -rd12b777142b83d010bfe0d1c740767f9a7bf97f2 --- AlarmDefs.h (.../AlarmDefs.h) (revision 9e64bac640514113f61cec766b08452d7b39d753) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d12b777142b83d010bfe0d1c740767f9a7bf97f2) @@ -29,6 +29,8 @@ #define ALM_ESC_4_MIN (4 * 60000) ///< Number of ms in 4 minutes. #define ALM_ESC_5_MIN (5 * 60000) ///< Number of ms in 5 minutes. #define ALM_ESC_10_MIN (10 * 60000) ///< Number of ms in 10 minutes. +#define ALM_ESC_30_MIN (30 * 60000) ///< Number of ms in 30 minutes. +#define ALM_ESC_90_MIN (90 * 60000) ///< Number of ms in 90 minutes. /// Enumeration of alarm IDs. enum Alarm_List @@ -130,7 +132,7 @@ ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94, ///< Post-acid concentrate conductivity out of range ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95, ///< Post-bicarb concentrate conductivity out of range ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96, ///< RO pump flow rate out of range - ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE = 97, ///< DG thermistors/sensors temperature out of range + ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97, ///< DG thermistors/sensors temperature out of range ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98, ///< DG fan RPM out of range ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99, ///< DG dialysate fill runs out of time ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100, ///< DG concentrate pump CP1 speed control error @@ -148,6 +150,11 @@ ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112, ///< DG flow rate out of lower range ALARM_ID_DRAIN_PUMP_OFF_FAULT = 113, ///< DG drain pump off fault ALARM_ID_RO_PUMP_OFF_FAULT = 114, ///< DG RO pump off fault + ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 115, ///< HD prime dialysate dialyzer time out alarm + ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 116, ///< HD prime dialysate bypass time out alarm + ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117, ///< HD prime completed low priority alarm + ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118, ///< HD prime completed medium priority alarm + ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119, ///< HD prime completed high priority alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -353,6 +360,12 @@ { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DRAIN_PUMP_OFF_FAULT { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RO_PUMP_OFF_FAULT + { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT + { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT + { ALARM_PRIORITY_LOW, 25, ALM_ESC_90_MIN, ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY + { ALARM_PRIORITY_MEDIUM, 4, ALM_ESC_30_MIN, ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY + { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY + // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew UsrAck }; #endif // included by AlarmMgmt.c