Index: AlarmDefs.h =================================================================== diff -u -r9a8124221a968e11a2592531d58bff35f3fba5b2 -re18e375cbca9764a87a7f82b22cd5b44f3cd1b7b --- AlarmDefs.h (.../AlarmDefs.h) (revision 9a8124221a968e11a2592531d58bff35f3fba5b2) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e18e375cbca9764a87a7f82b22cd5b44f3cd1b7b) @@ -284,7 +284,7 @@ ALARM_ID_FW_RESERVED_252 = 252, ///< FW reserved for use ALARM_ID_FW_RESERVED_253 = 253, ///< FW reserved for use ALARM_ID_FW_RESERVED_254 = 254, ///< FW reserved for use - ALARM_ID_TD_CARTRIDGE_REMOVAL_FAILURE = 255, ///< TD cartridge removal failure alarm + ALARM_ID_FW_RESERVED_255 = 255, ///< FW reserved for use ALARM_ID_FW_RESERVED_256 = 256, ///< FW reserved for use ALARM_ID_FW_RESERVED_257 = 257, ///< FW reserved for use ALARM_ID_FW_RESERVED_258 = 258, ///< FW reserved for use @@ -762,7 +762,7 @@ { 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_252 }, { 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_253 }, { 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_254 }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_CARTRIDGE_REMOVAL_FAILURE }, + { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_255 }, { 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_256 }, { 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_257 }, { 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_258 }, @@ -1068,7 +1068,7 @@ { 999, ALARM_ID_FW_RESERVED_252 }, { 999, ALARM_ID_FW_RESERVED_253 }, { 999, ALARM_ID_FW_RESERVED_254 }, - { 999, ALARM_ID_TD_CARTRIDGE_REMOVAL_FAILURE }, + { 999, ALARM_ID_FW_RESERVED_255 }, { 999, ALARM_ID_FW_RESERVED_256 }, { 999, ALARM_ID_FW_RESERVED_257 }, { 999, ALARM_ID_FW_RESERVED_258 }, @@ -1402,7 +1402,7 @@ { 252 , ALARM_ID_FW_RESERVED_252 , "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 | "}, { 253 , ALARM_ID_FW_RESERVED_253 , "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 | "}, { 254 , ALARM_ID_FW_RESERVED_254 , "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 | "}, - { 255 , ALARM_ID_TD_CARTRIDGE_REMOVAL_FAILURE, , "TD | Cartridge Still Detected | A problem has been detected during post-treatment. \n- Cartridge is still present or was unloaded incorrectly.\n- Confirm the cartridge has been fully removed. | Process: Post- Tx Remove Cartridge | TD cartridge removal failure alarm | In Post-Treatment: Verify Disposable Removal, if the cartridge is still detected after the user confirms disposable removal. | "}, + { 254 , ALARM_ID_FW_RESERVED_255 , "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 | "}, { 256 , ALARM_ID_FW_RESERVED_256 , "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 | "}, { 257 , ALARM_ID_FW_RESERVED_257 , "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 | "}, { 258 , ALARM_ID_FW_RESERVED_258 , "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 | "}, Index: DDDefs.h =================================================================== diff -u -rc34df760b62569baefc61aca92500291d001d133 -re18e375cbca9764a87a7f82b22cd5b44f3cd1b7b --- DDDefs.h (.../DDDefs.h) (revision c34df760b62569baefc61aca92500291d001d133) +++ DDDefs.h (.../DDDefs.h) (revision e18e375cbca9764a87a7f82b22cd5b44f3cd1b7b) @@ -294,16 +294,30 @@ /// Enumeration of available DD commands. enum DD_Command { - DD_CMD_NONE = 0, ///< Not a command - DD_CMD_START_FLUSH, ///< Command to request DD to start flush - DD_CMD_START_DISINFECT_HEAT, - DD_CMD_START_DISINFECT_CITRIC_DD, - DD_CMD_START_DISINFECT_CITRIC_DD_IOFP, - DD_CMD_START_DISINFECT_SUBSTITUTION_PORT, - NUM_OF_DD_COMMANDS ///< Number of DD commands + DD_CMD_NONE = 0, ///< Not a command + DD_CMD_GOTO_POST_GENERATE, ///< Command to request DD to transition to Post-Generate mode + DD_CMD_GOTO_STANDBY, ///< Command to request DD to transition to Standby mode + DD_CMD_START_DISINFECT_SKIP, ///< Command to skip disinfection + DD_CMD_START_DISINFECT_FLUSH, ///< Command to request DD to start flush + DD_CMD_START_DISINFECT_HEAT, ///< Command to request DD to start heat disinfection + DD_CMD_START_DISINFECT_HEAT_CITRIC, ///< Command to request DD to start heat disinfection with citric + DD_CMD_START_DISINFECT_SUBSTITUTION_PORT, ///< Command to request DD to start substitution port disinfection + NUM_OF_DD_COMMANDS ///< Number of DD commands }; -typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration +typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration +/// Enumeration of available disinfection selections. +enum Disinfect_Selection +{ + DISINFECT_SEL_SKIP = 0, ///< Selection to skip disinfection + DISINFECT_SEL_FLUSH, ///< Selection for flush + DISINFECT_SEL_HEAT, ///< Selection for heat disinfection + DISINFECT_SEL_HEAT_CITRIC, ///< Selection for heat disinfection with citric + DISINFECT_SEL_SUBSTITUTION_PORT, ///< Selection for substitution port disinfection + NUM_OF_DISINFECT_SELECTIONS ///< Number of disinfection selections +}; +typedef enum Disinfect_Selection DISINFECT_SELECTION_T; ///< Type for disinfection selection enumeration + /// Enumeration of general commands to DD sub-system. enum DD_General_Commands { Index: MsgDefs.h =================================================================== diff -u -rc34df760b62569baefc61aca92500291d001d133 -re18e375cbca9764a87a7f82b22cd5b44f3cd1b7b --- MsgDefs.h (.../MsgDefs.h) (revision c34df760b62569baefc61aca92500291d001d133) +++ MsgDefs.h (.../MsgDefs.h) (revision e18e375cbca9764a87a7f82b22cd5b44f3cd1b7b) @@ -219,8 +219,8 @@ MSG_ID_TD_POST_TREATMENT_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0xC9, ///< TD response to Post-Treatment disposable removal confirmation request. MSG_ID_UI_POST_TREATMENT_SUMMARY_REVIEW_COMPLETE_REQUEST = 0xCA, ///< UI confirms completion of the Post-Treatment treatment summary review. MSG_ID_TD_POST_TREATMENT_SUMMARY_REVIEW_COMPLETE_RESPONSE = 0xCB, ///< TD response to Post-Treatment treatment summary review completion. - MSG_ID_UI_POST_TREATMENT_DISINFECTION_SELECTION_REQUEST = 0xCC, ///< UI sends the selected Post-Treatment disinfection option. - MSG_ID_TD_POST_TREATMENT_DISINFECTION_SELECTION_RESPONSE = 0xCD, ///< TD response to the Post-Treatment disinfection selection. + MSG_ID_UI_DISINFECT_REQUEST = 0xCC, ///< UI sends the selected Post-Treatment disinfection option. + MSG_ID_TD_DISINFECT_RESPONSE = 0xCD, ///< TD response to the Post-Treatment disinfection selection. MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8, ///< TD POST final test result @@ -275,8 +275,6 @@ MSG_ID_TD_DD_FLUSH_REQUEST = 0x12B, ///< TD request to start DD flush mode. MSG_ID_TD_DD_HEAT_DISINFECT_REQUEST = 0x12C, ///< TD request to start DD heat disinfect mode. MSG_ID_TD_DD_HEAT_DISINFECT_ACTIVE_COOL_REQUEST = 0x12D, ///< TD request to start DD heat disinfect mode with active cooling. - MSG_ID_UI_DISINFECT_REQUEST = 0xCE, ///< UI request to start the selected disinfection or flush operation. - MSG_ID_TD_DISINFECT_RESPONSE = 0xCF, ///< TD response to the UI disinfection selection request. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID