Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r18981bf79f6c19a1822f003084e80547c21cdb62 -re24a98a344ba13ceb0663b415268a7e1dd5ce99e
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 18981bf79f6c19a1822f003084e80547c21cdb62)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e24a98a344ba13ceb0663b415268a7e1dd5ce99e)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    AirTrap.c
 *
-* @author  (last)      Sean
-* @date    (last)      03-Oct-2024
+* @author  (last)      Dara Navaei
+* @date    (last)      25-Nov-2025
 *
-* @author  (original)  Sean
-* @date    (original)  03-Oct-2024
+* @author  (original)  Sean Nash
+* @date    (original)  24-Oct-2024
 *
 ***************************************************************************/
 
@@ -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    = 10000;  //AIR_PUMP_LOWER_OP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
+    U32  airPumpStopTime    = 1000;  //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 )
@@ -452,7 +452,7 @@
     }
     // Transition back to closed state when air trap lower level operation completed when air detected at upper level
     else if ( ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) ) ||
-              ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16_LEVL ) ) )
+              ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) ) )
     {
         setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );