Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1efa1af5337b36f5022df5ce8cb7459352f13a8b -r9fcde8f2f5e133f06bc564b44a2fa930132add17
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1efa1af5337b36f5022df5ce8cb7459352f13a8b)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 9fcde8f2f5e133f06bc564b44a2fa930132add17)
@@ -87,7 +87,8 @@
 #define HOMING_STEP_CHANGE_IN_COUNTS            1000                                                    ///< Step change in counts during homing
 #define TRANSITION_STEP_CHANGE_IN_COUNTS        15000                                                   ///< Step change in counts during normal operations
 
-#define MAX_DEVIATION_FROM_TARGET_IN_COUNTS     150                                                     ///< Maximum deviation from target in counts
+#define MAX_DEVIATION_FROM_TARGET_IN_COUNTS     2500                                                    ///< Maximum deviation from target in counts
+#define MAX_DEVIATION_FROM_TGT_IN_TRAVEL_CNTS   150                                                     ///< Maximum deviation from target in counts
 #define MAX_DEVIATION_FROM_TRAGET_IN_POS_B      1000                                                    ///< Maximum allowed deviation from position B in counts
 #define MAX_ALLOWED_FAILED_HOMINGS              3U                                                      ///< Maximum allowed failed homings
 /// The time that the valve must be at the edge to be considered for edge detection
@@ -663,7 +664,7 @@
     S16 deltaPosition   = targetPosition - currentPosition;
 
     // If there has not been any major travel for a certain period of time
-    if ( deltaPosition > MAX_DEVIATION_FROM_TARGET_IN_COUNTS )
+    if ( deltaPosition > MAX_DEVIATION_FROM_TGT_IN_TRAVEL_CNTS )
     {
         if ( valvesStatus[ valve ].homingEdgeDetectionCounter >= HOMING_EDGE_DETECTION_TIME_INTERVAL )
         {
@@ -709,7 +710,7 @@
     S16 deltaPosition   = currentPosition - targetPosition;
 
     // Still too far from intermediate target position?  Either still more travel to go or stuck at end of travel
-    if ( deltaPosition > MAX_DEVIATION_FROM_TARGET_IN_COUNTS )
+    if ( deltaPosition > MAX_DEVIATION_FROM_TGT_IN_TRAVEL_CNTS )
     {
         // Are we stuck at end of travel?
         if ( valvesStatus[ valve ].homingEdgeDetectionCounter >= HOMING_EDGE_DETECTION_TIME_INTERVAL )
@@ -877,7 +878,7 @@
         }
     }
     // Check if the valve is close to the temporary target position and if it is, assign the next target position
-    else if ( abs( currentPosition - targetPosition ) < MAX_DEVIATION_FROM_TARGET_IN_COUNTS )
+    else if ( abs( currentPosition - targetPosition ) < MAX_DEVIATION_FROM_TGT_IN_TRAVEL_CNTS )
     {
         setValveNextStep( valve, TRANSITION_STEP_CHANGE_IN_COUNTS );
     }