Index: AlarmDefs.h =================================================================== diff -u -r082d844bfaf893d5298b98fcd5dad43b4dbe6544 -r582aa8716453ac0efea06d665594e24c05f586d8 --- AlarmDefs.h (.../AlarmDefs.h) (revision 082d844bfaf893d5298b98fcd5dad43b4dbe6544) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 582aa8716453ac0efea06d665594e24c05f586d8) @@ -233,6 +233,7 @@ ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 195, ///< DG chemical disinfect inlet conductivity and temperature out of range ALARM_ID_DG_FPGA_COMM_TIMEOUT = 196, ///< DG FPGA communication down for too long ALARM_ID_DG_LOAD_CELL_ADC_ERROR = 197, ///< DG load cell ADC error + ALARM_ID_DG_CONCENTRATE_PUMP_FAULT = 198, ///< DG concentrate pump fault NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -313,8 +314,6 @@ }; typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T; -#if defined(_HD_) - /// Record defining the properties of each individual alarm. struct AlarmsStateRecord { @@ -548,13 +547,12 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_DG_FPGA_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_DG_LOAD_CELL_ADC_ERROR + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CONCENTRATE_PUMP_FAULT // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; #endif // included by AlarmMgmt.c -#endif // HD build - /**@}*/ #endif