Index: TDDefs.h
===================================================================
diff -u -r313004fdb44f5500ad435b3ba53f73bc5b1e3c96 -r415d203866cf686241795e4a73dd96673493edee
--- TDDefs.h	(.../TDDefs.h)	(revision 313004fdb44f5500ad435b3ba53f73bc5b1e3c96)
+++ TDDefs.h	(.../TDDefs.h)	(revision 415d203866cf686241795e4a73dd96673493edee)
@@ -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,7 +208,7 @@
 enum TD_Pre_Treatment_Dry_Self_Tests_States
 {
     DRY_SELF_TESTS_START_STATE = 0,                            ///< Dry self-tests start state
-    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0,              ///< Wait for door close state
+    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,                  ///< Wait for door close state
     DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE,                  ///< Used tube set check state
     DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE,                ///< Tube set loaded check state
     DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE,              ///< Tube set authentication state
@@ -349,8 +350,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