Index: AlarmDefs.h =================================================================== diff -u -r9539f0936400a045f5884ffd5e4dc9d2545e97f8 -rd2ef95c1aefc2ae3214095a5f5c16565a333d221 --- AlarmDefs.h (.../AlarmDefs.h) (revision 9539f0936400a045f5884ffd5e4dc9d2545e97f8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d2ef95c1aefc2ae3214095a5f5c16565a333d221) @@ -294,13 +294,21 @@ ALARM_ID_HD_DG_COMPATIBILITY_ERROR = 256, ///< HD and DG software builds are not compatible ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257, ///< DG FPGA power out timeout ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258, ///< HD FPGA power out timeout - ALARM_ID_UI_POST_FAILURE_CAN = 259, ///< UI POST CANBus failure. - ALARM_ID_UI_POST_FAILURE_TOUCH = 260, ///< UI POST Touch failure. - ALARM_ID_UI_POST_FAILURE_SDCARD = 261, ///< UI POST SD-Card failure. - ALARM_ID_UI_POST_FAILURE_CRC = 262, ///< UI POST CRC failure. - ALARM_ID_UI_POST_FAILURE_WIFI = 263, ///< UI POST WiFi failure. - ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 264, ///< UI POST Bluetooth failure. - ALARM_ID_UI_POST_FAILURE_ETHERNET = 265, ///< UI POST Ethernet failure. + // ----- 259 is free to used + + // 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. + + NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -678,13 +686,16 @@ { 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_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_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_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_CAN , 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_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. @@ -821,13 +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_TOUCH }, - { 3, ALARM_ID_UI_POST_FAILURE_SDCARD }, - { 3, ALARM_ID_UI_POST_FAILURE_CRC }, - { 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_CAN }, + { 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_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 },