Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rceddc04641038a62bbbd9714a045d0cbfc473c8f -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision ceddc04641038a62bbbd9714a045d0cbfc473c8f)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -34,6 +34,11 @@
 #include "Valve3Way.h"
 #endif
 
+#ifdef TEST_PINCH_VALVES
+#include "FpgaTD.h"
+#include "LevelSensors.h"
+#endif
+
 /**
  *  @addtogroup TaskGeneral
  *  @{
@@ -63,8 +68,10 @@
 
     // Manage data received from other sub-systems
 #ifndef TEST_AIR_TRAP_ALPHA_TESTING
+#ifndef TEST_PINCH_VALVES
     execSystemCommRx();
 #endif
+#endif
 
     // Prevent most processing until UI has started communicating or if DG is active and alarm (ALARM_ID_HD_UI_COMM_POST_FAILED) is raised
     // proceed to further operations since UI likely failed to come up.
@@ -121,6 +128,44 @@
     }
 
     // ****************** Start Air Trap Test Code ************************
+
+#ifdef TEST_PINCH_VALVES
+#if 0
+    static BOOL vlvCmd = FALSE;
+    S16 pos = getH19EncoderPosition();
+
+    readValves();
+    // Get level sensor data
+    readAirTrapLevelSensors();
+    if ( TRUE == vlvCmd )
+    {
+        setValveCmdChangePosition( H1_VALV, 500, MOTOR_DIR_FORWARD );  // s/b ~30 deg
+        //setValveCmdChangePosition( H19_VALV, 2000, MOTOR_DIR_FORWARD );
+        vlvCmd = FALSE;
+    }
+#endif
+#if 1
+    {
+        static BOOL homeValveCmd = FALSE;
+        static BOOL setValvePos = FALSE;
+        static VALVE_POSITION_T setPos = VALVE_POSITION_A_INSERT_EJECT;  // VALVE_POSITION_B_OPEN VALVE_POSITION_C_CLOSE VALVE_POSITION_A_INSERT_EJECT
+
+        execValvesController();
+
+        if ( TRUE == homeValveCmd )
+        {
+            homeValve( H1_VALV, FALSE, FALSE );
+            homeValveCmd = FALSE;
+        }
+        if ( TRUE == setValvePos )
+        {
+            setValvePosition( H1_VALV, setPos );
+            setValvePos = FALSE;
+        }
+    }
+#endif
+#endif
+
 #ifdef TEST_AIR_TRAP_ALPHA_TESTING
 #if 0
     {