Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rca8d99e25bf12144593d4f9dcfab9f1564269ef0 -rb75d65317ad8e27ba340378e94a45846773b5c4b
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision ca8d99e25bf12144593d4f9dcfab9f1564269ef0)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b75d65317ad8e27ba340378e94a45846773b5c4b)
@@ -100,10 +100,11 @@
     U32 i;
 
     resetAirTrap();
-    airTrapDataPublicationTimerCounter      = DATA_PUBLISH_COUNTER_START_COUNT;
-    airTrapValveOpenAtStablePressureState   = TRUE;
+
     airPumpUpperLevelCtr                    = 0;
+    airTrapDataPublicationTimerCounter      = DATA_PUBLISH_COUNTER_START_COUNT;
     airPumpOnDelayStartTime                 = getMSTimerCount();
+    airTrapValveOpenAtStablePressureState   = TRUE;
 
     for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
     {
@@ -438,7 +439,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;
     }
 
@@ -467,6 +468,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 = getMSTimerCount();
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }