Index: firmware/App/Services/StateServices/TubeSetInstall.h
===================================================================
diff -u -r8345f0415ce34f2f47afcbf613a00216769f51c6 -r027a8c7ac2a20cae3304dd6d72d54a1edbc19820
--- firmware/App/Services/StateServices/TubeSetInstall.h	(.../TubeSetInstall.h)	(revision 8345f0415ce34f2f47afcbf613a00216769f51c6)
+++ firmware/App/Services/StateServices/TubeSetInstall.h	(.../TubeSetInstall.h)	(revision 027a8c7ac2a20cae3304dd6d72d54a1edbc19820)
@@ -35,23 +35,25 @@
 /// Enumeration of Tube Set install sub-states.
 enum Tube_Set_Install_States
 {
-    TUBE_SET_INSTALL_STATE_AWAIT_TUBE_SET_CONFIRMATION = 0,         ///< Awaiting user confirmation that tubeset is placed.
-    TUBE_SET_INSTALL_STATE_AWAIT_BP_DOOR_CLOSE,                     ///< Waiting for blood pump door to be closed.
-    TUBE_SET_INSTALL_STATE_AUTO_LOAD,                               ///< Auto-Load the tubeset state
-    TUBE_SET_INSTALL_STATE_AUTO_LOAD_BACK_OFF,                      ///< Auto-Load Back-off state
-    TUBE_SET_INSTALL_STATE_COMPLETE,                                ///< Install state complete
-    NUM_OF_TUBE_SET_INSTALL_SUB_STATES,                             ///< Num of install sub-states
+    TUBE_SET_INSTALL_STATE_AWAIT_TUBE_SET_CONFIRMATION = 0,         // Awaiting user confirmation that tubeset is placed.
+    TUBE_SET_INSTALL_STATE_AWAIT_BP_DOOR_CLOSE,                     // Waiting for blood pump door to be closed.
+    TUBE_SET_INSTALL_STATE_AUTO_LOAD,                               // Auto-Load the tubeset state
+    TUBE_SET_INSTALL_STATE_AWAIT_SETUP_CONNECTION_CONFIRMATION,     // Awaiting user confirmation that setup connections are complete.
+    TUBE_SET_INSTALL_STATE_AUTO_LOAD_BACK_OFF,                      // Auto-Load Back-off state
+    TUBE_SET_INSTALL_STATE_COMPLETE,                                // Install state complete
+    NUM_OF_TUBE_SET_INSTALL_SUB_STATES,                             // Num of install sub-states
 };
 /// Type for tube set install states enumeration
 typedef enum Tube_Set_Install_States TUBE_SET_INSTALL_STATE_T;
 
 // ********** public function prototypes **********
 
-void initTubeSetInstall( void );                                    // Initialize this service
-void execTubeSetInstall( void );                                    // Execute the service state machine (call from ModePreTreat and ModeTreatment)
+void initTubeSetInstall( void );                                         // Initialize this service
+void execTubeSetInstall( void );                                         // Execute the service state machine (call from ModePreTreat and ModeTreatment)
 
-BOOL isTubeSetInstallComplete( void );                              // Returns True once auto-load finished successfully
-BOOL handleAutoLoadRequest( MESSAGE_T *message );                   // Handle UI auto-load confirmation request
+BOOL isTubeSetInstallComplete( void );                                   // Returns True once auto-load finished successfully
+BOOL handleAutoLoadRequest( MESSAGE_T *message );                        // Handle UI auto-load confirmation request
+BOOL handleSetupTubingSetConnectionConfirmRequest( MESSAGE_T *message ); // Handle UI setup tubing set connection confirmation request
 
 void setTubeSetType( TUBE_SET_TYPE_T type );                        // Set the current installed tube set type      TODO: Call this after implementing bar code logic
 TUBE_SET_TYPE_T getTubeSetType( void );                             // Get the current installed tube set type