Index: TDDefs.h
===================================================================
diff -u -r413aa187b32921babc077451fb7c98578707497b -r2e0e2a06948d7a6fe23f06cd95604eeab994568e
--- TDDefs.h	(.../TDDefs.h)	(revision 413aa187b32921babc077451fb7c98578707497b)
+++ TDDefs.h	(.../TDDefs.h)	(revision 2e0e2a06948d7a6fe23f06cd95604eeab994568e)
@@ -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,                              ///< Consumable and cartridge installation 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
@@ -313,6 +314,16 @@
 /// Type for TD pre-treatment patient connect sub-mode states enumeration
 typedef enum TD_Pre_Treatment_Pat_Conn_States TD_PRE_TREATMENT_PAT_CONN_STATE_T;
 
+/// Enumeration of pre-treatment tubing-set install sub-states.
+enum PreTx_Install_States
+{
+    PRE_TX_INSTALL_STATE_AWAIT_TUBING_SET_CONFIRMATION = 0,         // Awaiting user confirmation that tubeset is placed.
+    PRE_TX_INSTALL_STATE_AUTO_LOAD,                                 // Auto-Loading the tubeset state
+    NUM_OF_PRE_TX_INSTALL_SUB_STATES,                               // Num of install sub-states
+};
+/// Type for TD pre-treatment tubing set install sub-mode states enumeration
+typedef enum PreTx_Install_States PRE_TX_INSTALL_STATE_T;
+
 /**@}*/
 
 /**
@@ -347,14 +358,26 @@
 /// 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,
     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
 };
 typedef enum TD_Post_Treatment_Mode_States TD_POST_TREATMENT_STATE_T;  ///< Type for TD post treatment mode states enumeration
 
+// Enumeration of Auto-Eject subs states.
+enum PostTx_AutoEject_States
+{
+    POST_TX_AUTO_EJECT_STATE_HOMING = 0,                            // Homing blood pump and ejector state
+    POST_TX_AUTO_EJECT_STATE_EXTENDING_EJECTOR,                     // Extending ejector state
+    POST_TX_AUTO_EJECT_STATE_EJECTING,                              // Ejecting tubeset state
+    POST_TX_AUTO_EJECT_STATE_RETRACTING_EJECTOR,                    // Retracting ejector state
+    NUM_OF_POST_TX_AUTO_EJECT_SUB_STATES,                           // Num of auto-eject sub-states
+};
+/// Type for TD post-treatment auto-eject sub-mode states enumeration
+typedef enum PostTx_AutoEject_States POST_TX_AUTO_EJECT_STATE_T;
+
 /**@}*/
 
 /**