Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rcc2aeed2bef39ae4e5d3b2f9b887bdc902b0d414 -reaff654b897f641b874e3ba30a22cbda3779e4a7
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision cc2aeed2bef39ae4e5d3b2f9b887bdc902b0d414)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision eaff654b897f641b874e3ba30a22cbda3779e4a7)
@@ -424,7 +424,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 )
@@ -447,6 +447,7 @@
         if ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) )
         {
             // TODO - alarm???
+            SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_TIMEOUT_REMOVE_TEMP, airPumpStopTime, 0 );
         }
         result = AIR_TRAP_CLOSED_STATE;
     }
@@ -477,6 +478,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;