Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r517905db003e860a4c4a21e9d0ac84e38be2d9ad -re2dc5254fd0a36724e817d27a21297e9f78ce4fd
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 517905db003e860a4c4a21e9d0ac84e38be2d9ad)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e2dc5254fd0a36724e817d27a21297e9f78ce4fd)
@@ -37,7 +37,7 @@
 
 
 #define AIR_TRAP_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the air trap data is published on the CAN bus.
-#define AIR_TRAP_FILL_TIMEOUT_MS            ( 6 * MS_PER_SECOND )                               ///< Air trap fill timeout period (in ms).
+#define AIR_TRAP_FILL_TIMEOUT_MS            ( 10 * MS_PER_SECOND )                               ///< Air trap fill timeout period (in ms).
 #define AIR_PUMP_ON_DELAY_TIME_MS           ( 10 * MS_PER_SECOND )                              ///< Delay between air pump On (in ms).
 #define AIR_PUMP_UPPER_LEVEL_PERSISTENCE    ( 100 / TASK_GENERAL_INTERVAL )                     ///< Persistence time for air pump operation after air trap upper level reads air.
 #define AIR_PUMP_ON_ERROR_MAX_CNT           6                                                   ///< Maximum number of air pump on events within time window before alarm triggered. Do not exceed MAX_TIME_WINDOWED_COUNT.
@@ -412,8 +412,8 @@
         }
     }
 
-    else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
-              ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) )
+    else if ( ( AIR_TRAP_LEVEL_AIR == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
+              ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) )
     {
         if ( AIR_PUMP_STATE_ON == getAirPumpState() )
         {