Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -ra024996e95e421c2db2734e3ae288e2bb0572d84 -r875cf25ae2e88989afc6d2add5d97415a3d8e57c
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision a024996e95e421c2db2734e3ae288e2bb0572d84)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 875cf25ae2e88989afc6d2add5d97415a3d8e57c)
@@ -349,7 +349,7 @@
         setValveAirTrap( STATE_CLOSED );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_MANUAL_CONTROL_STATE, (U32)result )
     }
 
     checkPersistentAlarm( ALARM_ID_HD_AIR_TRAP_UPPER_LEVEL_FLUID_TIME_OUT, FALSE, (F32)AIR_TRAP_LEVEL_FLUID, (F32)AIR_TRAP_LEVEL_FLUID );
@@ -382,7 +382,7 @@
     {
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_CLOSED_STATE, (U32)result )
 
         if ( AIR_PUMP_STATE_ON == getAirPumpState() )
         {
@@ -403,7 +403,7 @@
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_CLOSED_STATE, (U32)result )
     }
 
     // Turn air pump off after defined time or air detected at upper level
@@ -442,7 +442,7 @@
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_CLOSED_STATE, (U32)result )
     }
 
     return result;
@@ -467,7 +467,7 @@
     {
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_OPEN_STATE, (U32)result )
     }
     // Transition to closed valve state when fluid detected at upper level
     else if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
@@ -477,7 +477,7 @@
         signalLowVenousPressureCheck();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)result, 0 )
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_OPEN_STATE, (U32)result )
     }
     return result;
 }