Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rd466db5e5f2d865456aa12140b3d1bb56335730b -re9f7c0ae1796e7014436bb79e6b429f185ae5f24
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision d466db5e5f2d865456aa12140b3d1bb56335730b)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision e9f7c0ae1796e7014436bb79e6b429f185ae5f24)
@@ -37,7 +37,7 @@
 
 #define VALVES_DATA_PUB_INTERVAL            ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Valves data publish interval.
 #define DATA_PUBLISH_COUNTER_START_COUNT    13                                                  ///< Valves data publish start counter.
-#define VALVE_TRANSITION_MIN_TGT_DELTA      5                                                   ///< Minimum encoder position delta from target position to end transition state.
+#define VALVE_TRANSITION_MIN_TGT_DELTA      15                                                  ///< Minimum encoder position delta from target position to end transition state.
 #define VALVE_HOME_MIN_POS_CHG              3                                                   ///< Minimum encoder position change to indicate a home operation is still moving toward edge.
 #define VALVE_HOME_BACK_OFF_EDGE            3                                                   ///< Encoder counts to back off of detected edge position.
 #define MAX_HOME_FULL_TRAVEL_DIFF           10U                                                 ///< Maximum allowed difference in full travel encoder counts between expected and measured during home operation.
@@ -472,14 +472,14 @@
         {
             currentValveStates[ valve ].currentPosition   = VALVE_POSITION_NOT_IN_POSITION;
             // TODO - alarm
-            nextState = VALVE_STATE_HOMING_NOT_HOMED;
+            nextState = VALVE_STATE_IDLE;
         }
     }
     else if ( ( TRUE == didTimeout( currentValveStates[ valve ].valveOpsStartTime, VALVE_TRANSITION_TIMEOUT_MS ) ) &&
               ( TRUE != getCPLDACPowerLossDetected() ) )
     {
         currentValveStates[ valve ].currentPosition   = VALVE_POSITION_NOT_IN_POSITION;
-        currentValveStates[ valve ].hasValveBeenHomed = FALSE;
+        //currentValveStates[ valve ].hasValveBeenHomed = FALSE;
 
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT, (U32)valve, (U32)getPinchValvePosition( valve ) )
 
@@ -488,7 +488,7 @@
             activateSafetyShutdown();
         }
 
-        nextState = VALVE_STATE_HOMING_NOT_HOMED;
+        nextState = VALVE_STATE_IDLE;
     }
 
     return nextState;