Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r62dd464b8b5c6c5cba968ba63aca7c0ed12f445a -rf1bcaa360cd1e5cdee553ca0954a083bf61ec7e6
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 62dd464b8b5c6c5cba968ba63aca7c0ed12f445a)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f1bcaa360cd1e5cdee553ca0954a083bf61ec7e6)
@@ -104,6 +104,7 @@
     airTrapDataPublicationTimerCounter      = DATA_PUBLISH_COUNTER_START_COUNT;
     airTrapValveOpenAtStablePressureState   = TRUE;
     airPumpOnDelayStartTime                 = getMSTimerCount();
+    airTrapValveOpenAtStablePressureState   = TRUE;
     stopAirPumpStartTime                    = 0;
 
     for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
@@ -439,7 +440,7 @@
 
         setValveAirTrap( STATE_OPEN );
         fillStartTime = getMSTimerCount();
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, 0, 0 );
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
     }
 
@@ -468,6 +469,8 @@
     else if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
         setValveAirTrap( STATE_CLOSED );
+        signalLowVenousPressureCheck();
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         airPumpOnDelayStartTime = u32DiffWithWrap( AIR_PUMP_ON_DELAY_ADJUST_AFTER_FILL, getMSTimerCount() );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }