Index: AlarmDefs.h =================================================================== diff -u -r83abb117912ec3043096c68624837ca840f440c6 -rdcda249ed56869b22138e60282b00c728a928a6e --- AlarmDefs.h (.../AlarmDefs.h) (revision 83abb117912ec3043096c68624837ca840f440c6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision dcda249ed56869b22138e60282b00c728a928a6e) @@ -80,7 +80,7 @@ ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 42, ///< Dialysis outlet pump failed rotor speed check. Mismatch with rotor and motor speeds ALARM_ID_WATCHDOG_EXPIRED = 43, // TODO remove when DEN-12224 merged ///< Watchdog expired error. Watchdog was not "pet" within the appropriate time ALARM_ID_UI_COMM_TIMEOUT = 44, ///< User interface communication timeout - ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 45, // TODO remove when DEN-12224 merged ///< Too many bad CRCs detected on received system messages + ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45, // TODO remove when DEN-12224 merged ///< Too many bad CRCs detected on received system messages ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46, ///< System message that required acknowledgment was not acknowledged ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 47, ///< Ultrafiltration rate is too high error during treatment ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 48, ///< Ultrafiltration volume accuracy error during treatment @@ -490,7 +490,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_CAN_MESSAGE_NOT_ACKED, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_RATE_TOO_HIGH_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -812,7 +812,7 @@ { 3, ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, { 3, ALARM_ID_WATCHDOG_EXPIRED }, { 3, ALARM_ID_UI_COMM_TIMEOUT }, - { 3, ALARM_ID_COMM_TOO_MANY_BAD_CRCS }, + { 3, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, { 3, ALARM_ID_CAN_MESSAGE_NOT_ACKED }, { 3, ALARM_ID_UF_RATE_TOO_HIGH_ERROR }, { 3, ALARM_ID_UF_VOLUME_ACCURACY_ERROR },