Index: firmware/App/Modes/StateTxPaused.c
===================================================================
diff -u -r9a8e1fc597eb4f681527e691fb6cb24e550d8b92 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 9a8e1fc597eb4f681527e691fb6cb24e550d8b92)
+++ firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -15,20 +15,20 @@
 *
 ***************************************************************************/
 
-#include "AirPump.h"
+#include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "Common.h"
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "RotaryValve.h"
 #include "StateTxPaused.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TxParams.h"
 #include "Valves.h"
 #include "Valve3Way.h"
 
@@ -402,7 +402,7 @@
             setBloodPumpTargetFlowRate( targetBloodFlowMLPM, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
             setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
-            setAirPumpState( AIR_PUMP_STATE_OFF, 0 );
+            startAirTrapControl();
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             cmdBypassDialyzer( TRUE );
@@ -419,7 +419,7 @@
             signalBloodPumpHardStop();
             setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
-            setAirPumpState( AIR_PUMP_STATE_OFF, 0 );
+            endAirTrapControl();
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             cmdBypassDialyzer( TRUE );
@@ -436,7 +436,7 @@
             setBloodPumpTargetFlowRate( targetBloodFlowMLPM, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
             setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );
             setValvePosition( H19_VALV, VALVE_POSITION_B_OPEN );
-            setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_LOWER_PWM ); // TODO is the PWM Correct?
+            startAirTrapControl();
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
             cmdBypassDialyzer( TRUE );
@@ -450,7 +450,7 @@
             signalBloodPumpHardStop();
             setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
-            setAirPumpState( AIR_PUMP_STATE_OFF, 0 );
+            endAirTrapControl();
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             cmdBypassDialyzer( TRUE );