Index: AlarmDefs.h =================================================================== diff -u -r3b08252bf0110d860e3776ae8035c4b2efc70f76 -rc9dfd203b788df6bdfc3779800425c47095c8c47 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3b08252bf0110d860e3776ae8035c4b2efc70f76) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c9dfd203b788df6bdfc3779800425c47095c8c47) @@ -306,8 +306,7 @@ ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 267, ///< UI POST Bluetooth failure. ALARM_ID_UI_POST_FAILURE_ETHERNET = 268, ///< UI POST Ethernet failure. ALARM_ID_UI_POST_FAILURE_SOUND = 269, ///< UI POST Sound failure. - - + ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE = 270, ///< HD Fan RPM out of range NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -696,6 +695,7 @@ { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_BLUETOOTH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_ETHERNET, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_SOUND, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -927,6 +927,7 @@ { 799, ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT }, { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, + { 799, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, Index: MsgDefs.h =================================================================== diff -u -r305a3b8b1358dae02880dc06db55173207e73298 -rc9dfd203b788df6bdfc3779800425c47095c8c47 --- MsgDefs.h (.../MsgDefs.h) (revision 305a3b8b1358dae02880dc06db55173207e73298) +++ MsgDefs.h (.../MsgDefs.h) (revision c9dfd203b788df6bdfc3779800425c47095c8c47) @@ -192,8 +192,8 @@ MSG_ID_REQUEST_HD_USAGE_INFO = 0xA0, ///< HD request usage information MSG_ID_DG_SWITCHES_DATA = 0xA1, ///< DG switches data publish MSG_ID_HD_SWITCHES_DATA = 0xA2, ///< HD switches data publish + MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish - #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing #endif @@ -301,7 +301,8 @@ MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE = 0x8065, ///< HD temperatures value override request - MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0x8066, ///< HD temperatures data publish override request + MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0x8066, ///< HD temperatures data publish override request + MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0x8067, ///< HD fans data publish override request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in