Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r79a1bc916aaa25b696385e9b292bf6262bab6113 -rbccdf42b4195cd774760bc75dc21ab78727f9a4a
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 79a1bc916aaa25b696385e9b292bf6262bab6113)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
@@ -440,7 +440,7 @@
     // Air pump stop time based on the blood flow rate
     S32  qB                 = 500; // TODO abs( getTargetBloodFlowRate() );
     U32  qBx                = ( 0 == qB ? MIN_SET_BLOOD_FLOW_RATE : (U32)qB );
-    U32  airPumpStopTime    = AIR_PUMP_LOWER_OP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
+    U32  airPumpStopTime    = 10000;  //AIR_PUMP_LOWER_OP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
 
     // Transition to manual valve control state when requested
     if ( TRUE == pendingStopAirTrapController )
@@ -523,6 +523,7 @@
         data.h13State     = get3WayValveState( H13_VALV );
         data.h20State     = get3WayValveState( H20_VALV );
         data.isAutoControlling  = isAirTrapControlling();
+        data.airTrapState = airTrapControllerState;
 
         broadcastData( MSG_ID_TD_AIR_TRAP_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( AIR_TRAP_PAYLOAD_T ) );
         airTrapDataPublicationTimerCounter = 0;