Index: AlarmDefs.h =================================================================== diff -u -r806853257e55e966ed206b36bf7c979aa1181268 -raf26e89e8d8ec5e0804134b04d032d4faaa595eb --- AlarmDefs.h (.../AlarmDefs.h) (revision 806853257e55e966ed206b36bf7c979aa1181268) +++ AlarmDefs.h (.../AlarmDefs.h) (revision af26e89e8d8ec5e0804134b04d032d4faaa595eb) @@ -343,6 +343,10 @@ ALARM_ID_HD_CPU_RAM_ERROR = 305, ///< HD processor RAM error ALARM_ID_HD_AIR_TRAP_OVERFILL = 306, ///< HD air trap over-fill alarm 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 @@ -780,7 +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, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_AIR_TRAP_OVERFILL, 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, 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. @@ -1000,6 +1008,10 @@ { 3, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_HD_AIR_TRAP_OVERFILL }, + { 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 }, { 3, ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK },