Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r37294a71c0b3e3ca67ccb10b85536d124d3ef028 -r101c03d165ec613ba384bdad53100ba7bdda1e2c
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 37294a71c0b3e3ca67ccb10b85536d124d3ef028)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 101c03d165ec613ba384bdad53100ba7bdda1e2c)
@@ -301,7 +301,11 @@
  *************************************************************************/
 static VALVE_STATE_T handleValvesWait4PostState( VALVE_T valve )
 {
+#ifndef TEST_PINCH_VALVES
     VALVE_STATE_T nextState = VALVE_STATE_WAIT_FOR_POST;
+#else
+    VALVE_STATE_T nextState = VALVE_STATE_HOMING_NOT_STARTED;
+#endif
 
     if ( valve < NUM_OF_VALVES )
     {
Index: firmware/App/Drivers/RotaryValve.c
===================================================================
diff -u -rf1e3338feb8fccadf01aa629aec4a55132f6fd77 -r101c03d165ec613ba384bdad53100ba7bdda1e2c
--- firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision f1e3338feb8fccadf01aa629aec4a55132f6fd77)
+++ firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision 101c03d165ec613ba384bdad53100ba7bdda1e2c)
@@ -102,9 +102,9 @@
     U32 i;
 
     // Get latest valve status and positions from FPGA
-    currentValveEncPosition[ H19_VALV ].data = (S32)getValveEncoderPosition( H19_VALV );
+    currentValveEncPosition[ H19_VALV ].data = (S32)getH19EncoderPosition();
     valveStatus[ H19_VALV ].data             = getH19Status();
-    currentValveEncPosition[ H1_VALV ].data  = (S32)getValveEncoderPosition( H1_VALV );
+    currentValveEncPosition[ H1_VALV ].data  = (S32)getH1EncoderPosition();
     valveStatus[ H1_VALV ].data              = getH1Status();
 
     // TODO - compare commanded vs. read position
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r679ed8977c24e6ce6893e652a10ef97af82be2b0 -r101c03d165ec613ba384bdad53100ba7bdda1e2c
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 679ed8977c24e6ce6893e652a10ef97af82be2b0)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 101c03d165ec613ba384bdad53100ba7bdda1e2c)
@@ -134,7 +134,7 @@
     // ****************** Start Air Trap Test Code ************************
 
 #ifdef TEST_PINCH_VALVES
-#if 1
+#if 0
     static U32 vlvCmd = 0;
     S16 pos = getH19EncoderPosition();
 
@@ -154,7 +154,7 @@
         vlvCmd = 0;
     }
 #endif
-#if 0
+#if 1
     {
         static BOOL homeValveCmd = FALSE;
         static BOOL setValvePos = FALSE;