Index: DDDefs.h =================================================================== diff -u -r5a84d69bf6a123f083528cb2aec6c509b6566485 -r8c8d17fd68a067775d2bf6569842699319482f17 --- DDDefs.h (.../DDDefs.h) (revision 5a84d69bf6a123f083528cb2aec6c509b6566485) +++ DDDefs.h (.../DDDefs.h) (revision 8c8d17fd68a067775d2bf6569842699319482f17) @@ -293,10 +293,10 @@ /// 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 + 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 general commands to DD sub-system. enum DD_General_Commands @@ -443,6 +443,9 @@ P37_VALV, ///< Valve (P37) P39_VALV, ///< Valve (P39) P6_VALV, ///< Valve (P6) + P3_VALV, ///< Valve (P3) + P43_VALV, ///< Valve (P43) + P48_VALV, ///< Valve (P48) LAST_FP_VALVE = P6_VALV, ///< Last FP valve DD_NUM_OF_VALVES ///< Number of DD valves }; Index: TDDefs.h =================================================================== diff -u -r120fd7ca81fcac1afc909da35dca50ab6c8c4c00 -r8c8d17fd68a067775d2bf6569842699319482f17 --- TDDefs.h (.../TDDefs.h) (revision 120fd7ca81fcac1afc909da35dca50ab6c8c4c00) +++ TDDefs.h (.../TDDefs.h) (revision 8c8d17fd68a067775d2bf6569842699319482f17) @@ -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 /**@}*/ @@ -878,15 +882,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