Index: AlarmDefs.h =================================================================== diff -u -r22c198bec7c2e7bb993e68d930a567bd8f26c36f -r4afc5fdb64135add3051d793f05cc15e52df6f89 --- AlarmDefs.h (.../AlarmDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) @@ -51,7 +51,7 @@ ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD = 20, ///< DD didn't get ACK on message to TD that required acknowledgment ALARM_ID_DD_FPGA_POST_TEST_FAILED = 21, ///< DD FPGA POST failure ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 22, ///< DD processor clock speed checks against FPGA clock failure - ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DG FPGA communication down for too long + ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DD FPGA communication down for too long ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE = 24, ///< TD alarm audio failed POST ALARM_ID_DD_VALVE_CONTROL_FAILURE = 25, ///< DD FPGA not accepting commanded valve states NUM_OF_ALARM_IDS ///< Total number of alarms @@ -156,7 +156,7 @@ ALARM_PRIORITY_T alarmPriority; ///< Priority of alarm U32 alarmSubRank; ///< Alarm's rank within it's priority BOOL alarmIsFault; ///< Alarm is a system fault? - BOOL alarmIsDGFault; ///< Alarm is a fault for DG + BOOL alarmIsDDFault; ///< Alarm is a fault for DD BOOL alarmStops; ///< Alarm activation should cause a controlled stop BOOL alarmConditionClearImmed; ///< Alarm condition is cleared immediately (does not persist after alarm triggered) BOOL alarmNoClear; ///< Alarm cannot be cleared (unrecoverable)? @@ -185,7 +185,7 @@ /// Table of alarms and their static properties. const ALARM_T ALARM_TABLE[] = -{ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID +{ // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_NONE, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_SOFTWARE_FAULT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_SOFTWARE_FAULT }, @@ -213,7 +213,7 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_VALVE_CONTROL_FAILURE }, -}; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID +}; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. const ALARM_RANK_T ALARM_RANK_TABLE[] =