Index: AlarmDefs.h =================================================================== diff -u -reca1276c16bf2a6e75942930da0751bca86ba7e5 -r6b7b39ca05636f3c413b46934e90ac315fa1fb75 --- AlarmDefs.h (.../AlarmDefs.h) (revision eca1276c16bf2a6e75942930da0751bca86ba7e5) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6b7b39ca05636f3c413b46934e90ac315fa1fb75) @@ -234,9 +234,9 @@ ALARM_ID_FW_RESERVED_202 = 202, ///< FW reserved for use ALARM_ID_FW_RESERVED_203 = 203, ///< FW reserved for use ALARM_ID_FW_RESERVED_204 = 204, ///< FW reserved for use - ALARM_ID_FW_RESERVED_205 = 205, ///< FW reserved for use - ALARM_ID_FW_RESERVED_206 = 206, ///< FW reserved for use - ALARM_ID_FW_RESERVED_207 = 207, ///< FW reserved for use + ALARM_ID_TD_UI_POST_TIMEOUT = 205, ///< TD UI POST failed + ALARM_ID_TD_UI_COMPATIBILITY_ERROR = 206, ///< TD and UI software builds are not compatible + ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 207, ///< TD POST Safety Shutdown failure ALARM_ID_FW_RESERVED_208 = 208, ///< FW reserved for use ALARM_ID_FW_RESERVED_209 = 209, ///< FW reserved for use ALARM_ID_FW_RESERVED_210 = 210, ///< FW reserved for use @@ -710,9 +710,9 @@ { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_202 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_203 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_204 }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_205 }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_206 }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_207 }, + { ALARM_PRIORITY_HIGH, 1, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, + { ALARM_PRIORITY_HIGH, 1, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_UI_POST_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 1, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_UI_COMPATIBILITY_ERROR }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_208 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_209 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_210 }, @@ -842,6 +842,9 @@ { 1, ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_TD_EJECTOR_POST_TEST_FAILED }, + { 1, ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, + { 1, ALARM_ID_TD_UI_POST_TIMEOUT }, + { 1, ALARM_ID_TD_UI_COMPATIBILITY_ERROR }, { 10, ALARM_ID_TD_SOFTWARE_FAULT }, { 10, ALARM_ID_TD_UI_COMM_TIMEOUT }, { 10, ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS }, @@ -1018,9 +1021,6 @@ { 999, ALARM_ID_FW_RESERVED_202 }, { 999, ALARM_ID_FW_RESERVED_203 }, { 999, ALARM_ID_FW_RESERVED_204 }, - { 999, ALARM_ID_FW_RESERVED_205 }, - { 999, ALARM_ID_FW_RESERVED_206 }, - { 999, ALARM_ID_FW_RESERVED_207 }, { 999, ALARM_ID_FW_RESERVED_208 }, { 999, ALARM_ID_FW_RESERVED_209 }, { 999, ALARM_ID_FW_RESERVED_210 }, @@ -1350,9 +1350,9 @@ { 202 , ALARM_ID_FW_RESERVED_202 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 203 , ALARM_ID_FW_RESERVED_203 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 204 , ALARM_ID_FW_RESERVED_204 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, - { 205 , ALARM_ID_FW_RESERVED_205 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, - { 206 , ALARM_ID_FW_RESERVED_206 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, - { 207 , ALARM_ID_FW_RESERVED_207 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, + { 205 , ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED , "TD | Service Required: Hemodialysis Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Safety Shutdown Failure | TD safety shutdown POST test failed | if the 24V actuator supply does not turn off during safety shutdown, or if the 24V actuator supply does not recover after safety shutdown is cleared. | "}, + { 206 , ALARM_ID_TD_UI_POST_TIMEOUT , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD POST: UI POST Timeout | TD UI POST timeout failure | If the UI POST process did not complete within the expected time. | "}, + { 207 , ALARM_ID_TD_UI_COMPATIBILITY_ERROR , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI Compatibility Error | TD and UI software builds are not compatible | If the UI software version is not compatible with the TD software version. | "}, { 208 , ALARM_ID_FW_RESERVED_208 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 209 , ALARM_ID_FW_RESERVED_209 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 210 , ALARM_ID_FW_RESERVED_210 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, @@ -1449,6 +1449,7 @@ { 298 , ALARM_ID_FW_RESERVED_298 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 299 , ALARM_ID_FW_RESERVED_299 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 300 , ALARM_ID_FW_RESERVED_300 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, +>>>>>>> origin/staging }; #endif // manual alarms