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;
Index: firmware/App/Controllers/AirTrap.h
===================================================================
diff -u -reaff654b897f641b874e3ba30a22cbda3779e4a7 -rbccdf42b4195cd774760bc75dc21ab78727f9a4a
--- firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision eaff654b897f641b874e3ba30a22cbda3779e4a7)
+++ firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
@@ -62,6 +62,8 @@
 
 BOOL testAirTrapDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testSetAirTrapControl( MESSAGE_T *message );
+BOOL testAirPumpPowerRaiseOverride( MESSAGE_T *message );
+BOOL testAirPumpPowerLowerOverride( MESSAGE_T *message );
 
 /**@}*/
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r952a79dda24f4fb84937c8cc4e4dc9ef18c040f6 -rbccdf42b4195cd774760bc75dc21ab78727f9a4a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 952a79dda24f4fb84937c8cc4e4dc9ef18c040f6)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
@@ -117,7 +117,7 @@
     { MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testVoltageDataPublishIntervalOverride },
     { MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST,                               &testVoltageOverride },
     { MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST,                              &testPressureSensorOverride },
-    { MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testSwitchesDataPublishIntervalOverride },
+    { MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testPressuresDataPublishIntervalOverride },
     { MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST,                             &testSetAirPump },
     { MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testAirPumpDataPublishIntervalOverride },
     { MSG_ID_TD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testSwitchesDataPublishIntervalOverride },
@@ -168,7 +168,9 @@
     { MSG_ID_TD_SET_TEST_CONFIGURATION,                                 &testSetTestConfiguration },
     { MSG_ID_TD_GET_TEST_CONFIGURATION,                                 &testGetTestConfiguration },
     { MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS,                          &testResetAllTestConfigurations },
-    { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump }
+    { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
+    { MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST,                  &testAirPumpPowerRaiseOverride },
+    { MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST,                  &testAirPumpPowerLowerOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r5aa897d2ca22435bf7ec90dfdf656facb740276a -rbccdf42b4195cd774760bc75dc21ab78727f9a4a
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 5aa897d2ca22435bf7ec90dfdf656facb740276a)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
@@ -25,7 +25,7 @@
 #define TD_VERSION_MAJOR    0
 #define TD_VERSION_MINOR    0
 #define TD_VERSION_MICRO    0
-#define TD_VERSION_BUILD    14
+#define TD_VERSION_BUILD    17
 
 // ********** development build switches **********