Index: AlarmDefs.h =================================================================== diff -u -r31452caa8425df517e0d223fc009872cbcd30b1e -rba75be409c00c7843fe246897478f3fa497b3847 --- AlarmDefs.h (.../AlarmDefs.h) (revision 31452caa8425df517e0d223fc009872cbcd30b1e) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ba75be409c00c7843fe246897478f3fa497b3847) @@ -342,6 +342,11 @@ ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record ALARM_ID_HD_CPU_RAM_ERROR = 305, ///< HD processor RAM error ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE = 306, ///< HD measured flow checks against estimated flow failure + ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT = 307, ///< HD AC power lost second alarm + ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR = 308, ///< DG CPi conductivity sensor invalid character received + ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR = 309, ///< DG CPo conductivity sensor invalid character received + ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR = 310, ///< DG CD1 conductivity sensor invalid character received + ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR = 311, ///< DG CD2 conductivity sensor invalid character received NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -779,6 +784,11 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_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_DIAL_IN_FLOW_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM } + { ALARM_PRIORITY_HIGH, 18, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -994,6 +1004,10 @@ { 3, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_CPU_RAM_ERROR }, { 3, ALARM_ID_HD_CPU_RAM_ERROR }, + { 3, ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR }, + { 3, ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR }, + { 3, ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR }, + { 3, ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1010,6 +1024,7 @@ { 17, ALARM_ID_HD_EXCESSIVE_TILT }, { 17, ALARM_ID_DG_EXCESSIVE_TILT }, { 18, ALARM_ID_HD_AC_POWER_LOST }, + { 18, ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT }, { 19, ALARM_ID_DG_COMM_TIMEOUT }, { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP },