Index: AlarmDefs.h =================================================================== diff -u -r3db3280c153f78815041a38e69d692c31e99ec65 -r7d55beaee49c376ff0cd9ed8c39c2ac22a68f608 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3db3280c153f78815041a38e69d692c31e99ec65) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 7d55beaee49c376ff0cd9ed8c39c2ac22a68f608) @@ -760,7 +760,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 , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_255 }, + { 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 }, @@ -1400,7 +1400,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_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 | "}, + { 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 -r8c8d17fd68a067775d2bf6569842699319482f17 -r7d55beaee49c376ff0cd9ed8c39c2ac22a68f608 --- DDDefs.h (.../DDDefs.h) (revision 8c8d17fd68a067775d2bf6569842699319482f17) +++ DDDefs.h (.../DDDefs.h) (revision 7d55beaee49c376ff0cd9ed8c39c2ac22a68f608) @@ -36,6 +36,7 @@ DD_MODE_GEND, ///< Generate Dialysate mode DD_MODE_POSG, ///< Post Dialysate Generation mode DD_MODE_HEAT, ///< Heat Disinfect mode + DD_MODE_FLUS, ///< Flush mode DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode DD_MODE_UPDT, ///< Update mode @@ -293,11 +294,30 @@ /// Enumeration of available DD commands. enum DD_Command { - DD_CMD_NONE = 0, ///< Not a command - NUM_OF_DD_COMMANDS ///< Number of DD commands + DD_CMD_NONE = 0, ///< Not a command + 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 + 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 + 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 -rfe981aec00fa8485d564c1fd95642bc1d1d20f37 -r7d55beaee49c376ff0cd9ed8c39c2ac22a68f608 --- MsgDefs.h (.../MsgDefs.h) (revision fe981aec00fa8485d564c1fd95642bc1d1d20f37) +++ MsgDefs.h (.../MsgDefs.h) (revision 7d55beaee49c376ff0cd9ed8c39c2ac22a68f608) @@ -215,6 +215,12 @@ MSG_ID_TD_PRE_TREATMENT_STATES_DATA = 0xB7, ///< TD Pre-Treatment states broadcast data.. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response + MSG_ID_UI_POST_TREATMENT_DISPOSABLE_REMOVAL_CONFIRM_REQUEST = 0xC8, ///< UI confirms removal of the blood tubing set and consumables during Post-Treatment. + 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_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 @@ -266,6 +272,9 @@ MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x128, ///< DD NVM Set Blood Leak Sensor Calibration Record Response. MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0x129, ///< TD request for DD service record information. MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0x12A, ///< TD request for DD usage information. + 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. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID Index: TDDefs.h =================================================================== diff -u -rc34df760b62569baefc61aca92500291d001d133 -r7d55beaee49c376ff0cd9ed8c39c2ac22a68f608 --- TDDefs.h (.../TDDefs.h) (revision c34df760b62569baefc61aca92500291d001d133) +++ TDDefs.h (.../TDDefs.h) (revision 7d55beaee49c376ff0cd9ed8c39c2ac22a68f608) @@ -7,8 +7,8 @@ * * @file TDDefs.h * -* @author (last) suresh -* @date (last) 05-Aug-2026 +* @author (last) Praneeth Bunne +* @date (last) 18-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -274,25 +274,29 @@ * @{ */ -/// Enumeration of prime sub-mode states. -enum TD_Pre_Treatment_Prime_States +/// Enumeration of prime service states. +enum TD_Prime_States { - TD_PRIME_WAIT_FOR_USER_START_STATE = 0, ///< Wait for user to start prime state - TD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state - TD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state - TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state - TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE, ///< Wait for reservoir 1 fill complete - TD_PRIME_DIALYSATE_DIALYZER_STATE, ///< Dialysate dialyzer fluid path state - TD_PRIME_SALINE_DIALYZER_SETUP_STATE, ///< Saline dialyzer setup state - TD_PRIME_SALINE_DIALYZER_STATE, ///< Saline dialyzer fluid path state - TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete - TD_PRIME_DIALYSATE_BYPASS_STATE, ///< Dialysate bypass fluid path state - TD_PRIME_WET_SELF_TESTS_STATE, ///< Perform wet self-tests after priming complete - TD_PRIME_PAUSE, ///< Prime pause state, waits to be resumed - TD_PRIME_COMPLETE, ///< Prime complete state - NUM_OF_TD_PRIME_STATES ///< Number of prime sub-mode states + PRIME_START_STATE = 0, ///< Init (start) state. + PRIME_BC_INITIAL_REVERSE_STATE, ///< Blood circuit initial reverse prime state. + PRIME_BC_AIR_TRAP_LOWER_STATE, ///< Air Trap lower state + PRIME_BC_INITIAL_DIALYZER_STATE, ///< Blood circuit initial dialyzer prime state + PRIME_BC_FILL_STATE, ///< Blood circuit fill state + PRIME_BC_CLEAR_STATE1, ///< Blood circuit air clear stage 1 prime state + PRIME_BC_CLEAR_STATE2, ///< Blood circuit air clear stage 2 prime state + PRIME_BC_CLEAR_STATE3, ///< Blood circuit air clear stage 3 prime state + PRIME_WAIT_FOR_DIALYSATE_READY_STATE, ///< Wait for dialysate ready state + PRIME_DC_INITIAL_DIALYSATE_STATE, ///< Dialysate circuit Initial dialysate prime state + PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE, ///< Wait for air trap fill state + PRIME_BC2_FORWARD_RECIRC_STATE, ///< Blood circuit 2 forward recirc state + PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE, ///< Pause to rotate opp dir state + PRIME_BC2_REVERSE_RECIRC_STATE, ///< Blood circuit 2 reverse recirc state + PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE, ///< Priming Fluid Discard and Reverse Prime state + PRIME_PAUSE_STATE, ///< Prime pause state + PRIME_COMPLETE_STATE, ///< Prime complete state. + NUM_OF_PRIME_STATES ///< Number of Prime states. }; -typedef enum TD_Pre_Treatment_Prime_States TD_PRE_TREATMENT_PRIME_STATE_T; ///< Type for TD pre-treatment prime sub-mode states enumeration +typedef enum TD_Prime_States TD_PRIME_STATE_T; ///< Type for TD prime service states enumeration /**@}*/ @@ -879,15 +883,6 @@ GENERIC_CONFIRM_ID_NONE = 0, ///< Generic Confirm None GENERIC_CONFIRM_ID_POWER_OFF, ///< Power Off, User confirmation GENERIC_CONFIRM_ID_TREATMENT_END, ///< End treatment user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH, ///< Water flush stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT, ///< Heat disinfect stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL, ///< Chemical disinfect stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH, ///< Chemical disinfect flush stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL, ///< Chemical disinfect sample flush pass/fail - GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL, ///< Active cool stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE, ///< RO permeate sample stop user confirmation - GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE, ///< RO permeate sample stop or dispense - GENERIC_CONFIRM_ID_SHUT_DOWN, ///< Shutdown user confirmation GENERIC_CONFIRM_ID_RINSEBACK, ///< Rinseback user confirmation GENERIC_CONFIRM_ID_TEMPORARY_BREAK, ///< Temporary break user confirmation NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs