Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rb32a3dbf0675bb3378e09105e3a80ea9a7779828 -r6b96f1a18ab2f93068daddbf24178fbbae7cc570
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b32a3dbf0675bb3378e09105e3a80ea9a7779828)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 6b96f1a18ab2f93068daddbf24178fbbae7cc570)
@@ -135,27 +135,63 @@
 
 #ifdef TEST_PINCH_VALVES
 #if 0
-    static BOOL vlvCmd = FALSE;
+    static U32 vlvCmd = 0;
     S16 pos = getH19EncoderPosition();
 
     readValves();
     // Get level sensor data
     readAirTrapLevelSensors();
-    if ( TRUE == vlvCmd )
+    if ( 1 == vlvCmd )
     {
-        setValveCmdChangePosition( H1_VALV, 500, MOTOR_DIR_FORWARD );  // s/b ~30 deg
-        //setValveCmdChangePosition( H19_VALV, 2000, MOTOR_DIR_FORWARD );
-        vlvCmd = FALSE;
+        setValveCmdChangePosition( H1_VALV, 896, MOTOR_DIR_FORWARD );
+        setValveCmdChangePosition( H19_VALV, 1600, MOTOR_DIR_FORWARD );
+        vlvCmd = 0;
     }
+    if ( 2 == vlvCmd )
+    {
+        setValveCmdChangePosition( H1_VALV, 0, MOTOR_DIR_FORWARD );
+        setValveCmdChangePosition( H19_VALV, 0, MOTOR_DIR_FORWARD );
+        vlvCmd = 0;
+    }
 #endif
 #if 1
     {
         static BOOL homeValveCmd = FALSE;
         static BOOL setValvePos = FALSE;
+        static BOOL homeBPCmd = FALSE;
+        static BOOL bpHomed = FALSE;
+        static BOOL bpRunCmd = FALSE;
+        static BOOL bpStopCmd = FALSE;
+        static U32  bpSetPt = 300;
         static VALVE_POSITION_T setPos = VALVE_POSITION_A_INSERT_EJECT;  // VALVE_POSITION_B_OPEN VALVE_POSITION_C_CLOSE VALVE_POSITION_A_INSERT_EJECT
 
         execValvesController();
+        execBloodFlowMonitor();
+        execBloodFlowController();
 
+        bpHomed = isPeristalticPumpHome();
+        if ( TRUE == bpHomed )
+        {
+            bpHomed = FALSE;
+        }
+        if ( TRUE == homeBPCmd )
+        {
+            homeBloodPump();
+            homeBPCmd = FALSE;
+        }
+
+        if ( TRUE == bpRunCmd )
+        {
+            setBloodPumpTargetFlowRate( bpSetPt, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+            bpRunCmd = FALSE;
+        }
+        else if ( TRUE == bpStopCmd )
+        {
+            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+            bpStopCmd = FALSE;
+            //signalBloodPumpHardStop();
+        }
+
         if ( TRUE == homeValveCmd )
         {
             homeValve( H1_VALV, FALSE, FALSE );
@@ -208,17 +244,18 @@
 
     if ( FALSE == bpStart )
     {
-        setBloodPumpTargetRPM( 1200, MOTOR_DIR_FORWARD );
-//        homeEjector();
-//        retractEjector();
+//        setBloodPumpTargetRPM( 1200, MOTOR_DIR_FORWARD );
+        homeEjector();
+        retractEjector();
         bpStart = TRUE;
     }
     if ( TRUE == bpStop )
     {
         signalBloodPumpHardStop();
-        setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_OFF );
-        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//        setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_OFF );
+//        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+        extendEjector();
         bpStop = FALSE;
     }