Index: AlarmDefs.h =================================================================== diff -u -rb7e6990b284b0d8b21b50f8b3658309b06056eb6 -ree126f44be3877807d095031e08a6c00a89318b6 --- AlarmDefs.h (.../AlarmDefs.h) (revision b7e6990b284b0d8b21b50f8b3658309b06056eb6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ee126f44be3877807d095031e08a6c00a89318b6) @@ -296,16 +296,18 @@ ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258, ///< HD FPGA power out timeout ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259, ///< HD temperatures out of range // UI Alarms - ALARM_ID_UI_POST_FAILURE_CAN = 260, ///< UI POST CANBus failure. - ALARM_ID_UI_POST_FAILURE_DISPLAY = 261, ///< UI POST Display failure. - ALARM_ID_UI_POST_FAILURE_TOUCH = 262, ///< UI POST Touch failure. - ALARM_ID_UI_POST_FAILURE_SDCARD = 263, ///< UI POST SD-Card failure. - ALARM_ID_UI_POST_FAILURE_CRC = 264, ///< UI POST CRC failure. - ALARM_ID_UI_POST_FAILURE_WIFI = 265, ///< UI POST WiFi failure. - ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 266, ///< UI POST Bluetooth failure. - ALARM_ID_UI_POST_FAILURE_ETHERNET = 267, ///< UI POST Ethernet failure. - ALARM_ID_UI_POST_FAILURE_SOUND = 268, ///< UI POST Sound failure. - ALARM_ID_UI_POST_FAILURE_RESERVED_1 = 269, ///< UI POST RESERVED_1 failure. + ALARM_ID_UI_POST_FAILURE_FILESYSTEM = 260, ///< UI POST File System Integrity failure. + ALARM_ID_UI_POST_FAILURE_CANBUS = 261, ///< UI POST CANBus failure. + ALARM_ID_UI_POST_FAILURE_DISPLAY = 262, ///< UI POST Display failure. + ALARM_ID_UI_POST_FAILURE_TOUCH = 263, ///< UI POST Touch failure. + ALARM_ID_UI_POST_FAILURE_SDCARD = 264, ///< UI POST SD-Card failure. + ALARM_ID_UI_POST_FAILURE_RTC = 265, ///< UI POST RTC failure. + ALARM_ID_UI_POST_FAILURE_WIFI = 266, ///< UI POST WiFi failure. + 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. + + NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -683,17 +685,17 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DG_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_CAN , 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_FILESYSTEM , 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_CANBUS , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_DISPLAY , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_TOUCH , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_SDCARD , 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_CRC , 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_RTC , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_WIFI , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_BLUETOOTH , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_ETHERNET , 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_SOUND , 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_RESERVED_1 , 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. @@ -830,16 +832,16 @@ { 3, ALARM_ID_HD_DG_COMPATIBILITY_ERROR }, { 3, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT }, { 3, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT }, - { 3, ALARM_ID_UI_POST_FAILURE_CAN }, + { 3, ALARM_ID_UI_POST_FAILURE_FILESYSTEM }, + { 3, ALARM_ID_UI_POST_FAILURE_CANBUS }, { 3, ALARM_ID_UI_POST_FAILURE_DISPLAY }, { 3, ALARM_ID_UI_POST_FAILURE_TOUCH }, { 3, ALARM_ID_UI_POST_FAILURE_SDCARD }, - { 3, ALARM_ID_UI_POST_FAILURE_CRC }, + { 3, ALARM_ID_UI_POST_FAILURE_RTC }, { 3, ALARM_ID_UI_POST_FAILURE_WIFI }, { 3, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 3, ALARM_ID_UI_POST_FAILURE_ETHERNET }, { 3, ALARM_ID_UI_POST_FAILURE_SOUND }, - { 3, ALARM_ID_UI_POST_FAILURE_RESERVED_1 }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED },