Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -r0fab0eff29163e59678ed8af82636a54f1b4a30d
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 0fab0eff29163e59678ed8af82636a54f1b4a30d)
@@ -132,222 +132,6 @@
         execSystemCommTx();
     }
 
-    // ****************** Start Air Trap Test Code ************************
-
-#ifdef TEST_PINCH_VALVES
-#if 0
-    static U32 vlvCmd = 0;
-    S16 pos = getH19EncoderPosition();
-
-    readValves();
-    // Get level sensor data
-    readAirTrapLevelSensors();
-    if ( 1 == vlvCmd )
-    {
-        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 );
-            homeValveCmd = FALSE;
-        }
-        if ( TRUE == setValvePos )
-        {
-            setValvePosition( H1_VALV, setPos );
-            setValvePos = FALSE;
-        }
-    }
-#endif
-#endif
-
-#ifdef TEST_AIR_TRAP_ALPHA_TESTING
-#if 0
-    {
-        static U32 tmpCtr = 0;
-
-        ++tmpCtr;
-        if ( tmpCtr == ( 5 * 20 ) )
-        {
-            setAirPumpMotorPower( 250 );
-            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-        }
-        else if ( tmpCtr == ( 10 * 20 ) )
-        {
-            setAirPumpMotorPower( 0 );
-            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-        }
-        else if ( tmpCtr == ( 15 * 20 ) )
-        {
-            setAirPumpMotorPower( 250 );
-            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-        }
-        else if ( tmpCtr >= ( 20 * 20 ) )
-        {
-            setAirPumpMotorPower( 0 );
-            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            tmpCtr = 0;
-        }
-    }
-#endif
-#if 1
-    static U32 ctr = 0;
-    static U32 sta = 0;
-    static BOOL start = TRUE;
-    static BOOL bpStart = FALSE;
-    static BOOL bpStop = FALSE;
-
-    if ( FALSE == bpStart )
-    {
-//        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 );
-        extendEjector();
-        bpStop = FALSE;
-    }
-
-    // Get level sensor data
-    readAirTrapLevelSensors();
-    execSwitches();
-   // Control blood pump
-    execBloodFlowMonitor();
-    execBloodFlowController();
-    execEjectorController();
-    execAirPumpController();
-
-    switch ( sta )
-    {
-    case 0:
-        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 );
-
-        if ( TRUE == start )
-        {
-            sta = 1;
-            // lower the level
-            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 250 );
-        }
-        break;
-    case 1:
-        // look for air at low level and stop
-        if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
-        {
-            // stop lowering level
-            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
-            ctr = 0;
-            sta = 2;
-        }
-        break;
-    case 2:
-#if 1
-        // stay low for 5 sec
-        if ( ++ctr > ( 5 * 20 ) )
-        {
-            // raise the level
-            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 25 );
-            sta = 3;
-        }
-#endif
-        break;
-    case 3:
-        // look for fluid at high level and stop
-        if ( AIR_TRAP_LEVEL_FLUID == getRawLevelSensorState( H16_LEVL ) )
-        {
-            // stop raising level
-            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
-            ctr = 0;
-            sta = 4;
-        }
-        break;
-    case 4:
-#if 0
-        // look for air at high level
-        if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
-        {
-            // start raising level
-            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 100 );
-            sta = 3;
-        }
-#endif
-#if 1
-        // stay high for 5 sec
-        if ( ++ctr > ( 5 * 20 ) )
-        {
-            // lower the level
-            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 100 );
-            sta = 1;
-        }
-#endif
-        break;
-    default:
-        sta = 0;
-        break;
-    }
-#endif
-#endif
-    // ******************* End Air Trap Test Code *************************
-
 #ifdef TASK_TIMING_OUTPUT_ENABLED
     // Set GPIO low to indicate general task has finished executing
     setCPLDLampGreen( PIN_SIGNAL_LOW );