Index: TDDefs.h
===================================================================
diff -u -r8b98b48d47ac80c1acb73aa9b8dad45577da1be7 -rb5fc952634ed740f8b4722945c6ad682fb53a3fb
--- TDDefs.h	(.../TDDefs.h)	(revision 8b98b48d47ac80c1acb73aa9b8dad45577da1be7)
+++ TDDefs.h	(.../TDDefs.h)	(revision b5fc952634ed740f8b4722945c6ad682fb53a3fb)
@@ -7,8 +7,8 @@
 *
 * @file    TDDefs.h
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      07-May-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -66,6 +66,7 @@
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test state
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
+    POST_STATE_EJECTOR_HOMING,                          ///< Run ejector homing POST state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed state
     POST_STATE_FAILED,                                  ///< POST self-tests failed state
@@ -122,7 +123,7 @@
     TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0,                                ///< Water sample state
     TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
     TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
-    TD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
+    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE,                              ///< Tube set install state
     TD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self-tests when the cartridge is dry state
     TD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime blood and dialysate circuits and run wet self-tests state
     TD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
@@ -207,10 +208,9 @@
 enum TD_Pre_Treatment_Dry_Self_Tests_States
 {
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0,              ///< Wait for door close state
-    DRY_SELF_TESTS_USED_TUBING_SET_CHECK_STATE,                ///< Used tubing set check state
-    DRY_SELF_TESTS_TUBING_SET_LOADED_CHECK_STATE,              ///< Tubing set loaded check state
-    DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE,            ///< Tubing set authentication state
-    DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE,                    ///< Syringe pump seek state
+    DRY_SELF_TESTS_USED_TUBING_SET_CHECK_STATE,                ///< Used tube set check state
+    DRY_SELF_TESTS_TUBING_SET_LOADED_CHECK_STATE,              ///< Tube set loaded check state
+    DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE,            ///< Tube set authentication state
     DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE,         ///< Pressure sensor normal setup state
     DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE,                ///< Pressure venous setup state
     DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE,        ///< Venous pressure stabilization state
@@ -220,8 +220,6 @@
     DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE,      ///< Arterial pressure stabilization state
     DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE,         ///< Arterial pressure leak check state
     DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE,             ///< Arterial pressure relief state
-    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE,                   ///< Syringe prime state
-    DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE,         ///< Syringe pump occlusion check state
     DRY_SELF_TESTS_COMPLETE_STATE,                             ///< Complete state
     DRY_SELF_TESTS_STOPPED_STATE,                              ///< Stopped state
     NUM_OF_DRY_SELF_TESTS_STATES                               ///< Number of dry self-tests states
@@ -348,8 +346,8 @@
 /// Enumeration of post-treatment mode states.
 enum TD_Post_Treatment_Mode_States
 {
-    TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0,                       ///< Drain reservoirs state
-    TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE,                      ///< Patient disconnection state
+    TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0,                  ///< Patient disconnection state
+    TD_POST_TREATMENT_AUTO_EJECT_STATE,                                 ///< Auto eject state
     TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE,                         ///< Disposable removal state
     TD_POST_TREATMENT_VERIFY_STATE,                                     ///< Verify cartridge removed, syringe removed, and reservoirs drained state
     NUM_OF_TD_POST_TREATMENT_STATES                                     ///< Number of post-treatment mode states
@@ -787,6 +785,7 @@
     TD_EVENT_INSTIT_RECORD_UPDATE,                                      ///< TD new institutional record has been updated.
     TD_EVENT_VALVE_POS_CHANGE,                                          ///< TD pinch valve position change
     TD_EVENT_VALVE_HOMED_POS_SETTING,                                   ///< TD pinch valve homed encoder positions for A/B/C.
+    TD_EVENT_SYRINGE_PUMP_STATE,                                        ///< TD syringe pump state change event
     NUM_OF_TD_EVENT_IDS                                                 ///< Total number of TD events
 };
 typedef enum TD_Event_List TD_EVENT_ID_T;                               ///< Type for TD event list enumeration