Index: AlarmDefs.h =================================================================== diff -u -ree126f44be3877807d095031e08a6c00a89318b6 -r423db52192055ff7131750a7c7466965a6cf25a8 --- AlarmDefs.h (.../AlarmDefs.h) (revision ee126f44be3877807d095031e08a6c00a89318b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 423db52192055ff7131750a7c7466965a6cf25a8) @@ -686,16 +686,16 @@ { 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_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_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_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_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, 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 }, }; // 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. @@ -839,9 +839,6 @@ { 3, ALARM_ID_UI_POST_FAILURE_SDCARD }, { 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 }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -970,6 +967,9 @@ { 999, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT }, + { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, + { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET }, + { 999, ALARM_ID_UI_POST_FAILURE_SOUND }, { 999, ALARM_ID_NO_ALARM }, };