Index: firmware/App/Services/StateServices/TubeSetAutoEject.c
===================================================================
diff -u -rb74d08ff24839ebbea51582772ed2b9588558ea0 -r3f53d4aaf8840366306a6143eda9abf1a763bb73
--- firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision b74d08ff24839ebbea51582772ed2b9588558ea0)
+++ firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision 3f53d4aaf8840366306a6143eda9abf1a763bb73)
@@ -79,36 +79,34 @@
  *************************************************************************/
 void execTubeSetAutoEject( void )
 {
-    if( TRUE == ejectComplete )
+    if( FALSE == ejectComplete )
     {
-        return;
-    }
+        switch ( currentAutoEjectState )
+        {
+            case TUBE_SET_AUTO_EJECT_STATE_AWAIT_CONFIRMATION:
+                currentAutoEjectState = handleAutoEjectAwaitConfirmState();
+                break;
 
-    switch ( currentAutoEjectState )
-    {
-        case TUBE_SET_AUTO_EJECT_STATE_AWAIT_CONFIRMATION:
-            currentAutoEjectState = handleAutoEjectAwaitConfirmState();
-            break;
+            case TUBE_SET_AUTO_EJECT_STATE_HOMING:
+                currentAutoEjectState = handleAutoEjectHomingState();
+                break;
 
-        case TUBE_SET_AUTO_EJECT_STATE_HOMING:
-            currentAutoEjectState = handleAutoEjectHomingState();
-            break;
+            case TUBE_SET_AUTO_EJECT_STATE_EXTENDING_EJECTOR:
+                currentAutoEjectState = handleAutoEjectExtendingEjectorState();
+                break;
 
-        case TUBE_SET_AUTO_EJECT_STATE_EXTENDING_EJECTOR:
-            currentAutoEjectState = handleAutoEjectExtendingEjectorState();
-            break;
+            case TUBE_SET_AUTO_EJECT_STATE_EJECTING:
+                currentAutoEjectState = handleAutoEjectEjectingState();
+                break;
 
-        case TUBE_SET_AUTO_EJECT_STATE_EJECTING:
-            currentAutoEjectState = handleAutoEjectEjectingState();
-            break;
+            case TUBE_SET_AUTO_EJECT_STATE_RETRACTING_EJECTOR:
+                currentAutoEjectState = handleAutoEjectRetractingEjectorState();
+                break;
 
-        case TUBE_SET_AUTO_EJECT_STATE_RETRACTING_EJECTOR:
-            currentAutoEjectState = handleAutoEjectRetractingEjectorState();
-            break;
-
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE, (U32)currentAutoEjectState );
-            break;
+            default:
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE, (U32)currentAutoEjectState );
+                break;
+        }
     }
 }
 
@@ -158,7 +156,7 @@
     {
         extendEjector();
         autoEjectTimerCounter = 0;
-        state              = TUBE_SET_AUTO_EJECT_STATE_EXTENDING_EJECTOR;
+        state                 = TUBE_SET_AUTO_EJECT_STATE_EXTENDING_EJECTOR;
     }
 
     return state;
@@ -185,7 +183,7 @@
     {
         setBloodPumpTargetFlowRate( AUTO_EJECT_BLOOD_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         autoEjectTimerCounter = 0;
-        state              = TUBE_SET_AUTO_EJECT_STATE_EJECTING;
+        state                 = TUBE_SET_AUTO_EJECT_STATE_EJECTING;
     }
 
     return state;
@@ -215,7 +213,7 @@
         signalBloodPumpHardStop();
         retractEjector();
         autoEjectTimerCounter = 0;
-        state              = TUBE_SET_AUTO_EJECT_STATE_RETRACTING_EJECTOR;
+        state                 = TUBE_SET_AUTO_EJECT_STATE_RETRACTING_EJECTOR;
     }
 
     return state;
@@ -242,7 +240,7 @@
     {
         autoEjectTimerCounter = 0;
         ejectComplete         = TRUE;
-        state              = NUM_OF_TUBE_SET_AUTO_EJECT_SUB_STATES;
+        state                 = NUM_OF_TUBE_SET_AUTO_EJECT_SUB_STATES;
     }
 
     return state;
@@ -291,8 +289,8 @@
         }
         else
         {
-            autoEjectReqReceived     = TRUE;
-            result                   = TRUE;
+            autoEjectReqReceived = TRUE;
+            result               = TRUE;
         }
     }
     else