Index: AlarmDefs.h =================================================================== diff -u -raab05443dce50c4faf8d02ae2d345ccf7da00fa2 -r983c3c348aa50d7da0a285b891da3e88462e84a9 --- AlarmDefs.h (.../AlarmDefs.h) (revision aab05443dce50c4faf8d02ae2d345ccf7da00fa2) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 983c3c348aa50d7da0a285b891da3e88462e84a9) @@ -226,6 +226,8 @@ ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED = 194, ///< TD integrity post test fault ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED = 195, ///< TD integrity post test fault ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 196, ///< TD POST Safety Shutdown failure + ALARM_ID_TD_UI_POST_TIMEOUT = 197, ///< TD UI POST failed + ALARM_ID_TD_UI_COMPATIBILITY_ERROR = 198, ///< TD and UI software builds are not compatible NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -570,6 +572,8 @@ { ALARM_PRIORITY_HIGH, 1, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 1, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED }, { 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 }, }; // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -604,6 +608,8 @@ { 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 }, @@ -997,7 +1003,9 @@ { 193 , ALARM_ID_DD_CPU_RAM_ERROR , "DD | Service Required: Dialysate 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. | DD CPU RAM error | DD CPU RAM check failure | If the RAM status indicates any of the following: Double bit error, Address decode failure, Address decode logic element failure, Read address parity failure, Write address parity failure. | "}, { 194 , ALARM_ID_TD_INTEGRITY_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 Firmware Image Integrity Failure | TD firmware image integrity POST test failed | If the calculated CRC of the TD image does not match the expected CRC. | "}, { 195 , ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED , "DD | 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. | DD Firmware Image Integrity Failure | DD firmware image integrity POST test failed | If the calculated CRC of the DD image does not match the expected CRC. | "}, - { 195 , 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 Firmware Image Integrity Failure | TD firmware image integrity POST test failed | If the calculated CRC of the TD image does not match the expected CRC. | "}, + { 196 , 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. | "}, + { 197 , 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. | "}, + { 198 , 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. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -raab05443dce50c4faf8d02ae2d345ccf7da00fa2 -r983c3c348aa50d7da0a285b891da3e88462e84a9 --- MsgDefs.h (.../MsgDefs.h) (revision aab05443dce50c4faf8d02ae2d345ccf7da00fa2) +++ MsgDefs.h (.../MsgDefs.h) (revision 983c3c348aa50d7da0a285b891da3e88462e84a9) @@ -210,10 +210,11 @@ MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2, ///< TD response to pause/resume Heparin delivery request MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available. MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4, ///< FFU signal DD update is available. - MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5, ///< TD request UI confirmation + MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5, ///< TD request UI cancel. ToDo need update MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI confirmation result response - MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xBA, ///< TD POST final test result - MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xBB, ///< TD POST single test result + MSG_ID_TD_POWER_OFF_REQUEST = 0xB7, + MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8, ///< TD POST final test result + MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9, ///< TD POST single test result // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE, ///< TD tester log-in Index: TDDefs.h =================================================================== diff -u -r8f341c5fe87f7f4dbf8a0aeddf785414406b1882 -r983c3c348aa50d7da0a285b891da3e88462e84a9 --- TDDefs.h (.../TDDefs.h) (revision 8f341c5fe87f7f4dbf8a0aeddf785414406b1882) +++ TDDefs.h (.../TDDefs.h) (revision 983c3c348aa50d7da0a285b891da3e88462e84a9) @@ -59,7 +59,7 @@ POST_STATE_BLOOD_FLOW, ///< Run blood flow test state POST_STATE_VALVES, ///< Run valves test state POST_STATE_SYRINGE_PUMP, ///< Run syringe pump test state - POST_STATE_PRES_OCCL, ///< Run pressure occlusion state + POST_STATE_PRESSURE, ///< Run pressure occlusion state POST_STATE_ALARM_AUDIO, ///< Run alarm audio test state POST_STATE_ALARM_LAMP, ///< Run alarm lamp test state POST_STATE_TEMPERATURES, ///< Run temperatures POST state