Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rbccdf42b4195cd774760bc75dc21ab78727f9a4a -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
@@ -450,9 +450,11 @@
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
+    // TODO investigate the timeout
     // 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 ) ) )
+    //else if ( ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) ) ||
+    //          ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16_LEVL ) ) )
+    else if ( 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 );
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r952a79dda24f4fb84937c8cc4e4dc9ef18c040f6 -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 952a79dda24f4fb84937c8cc4e4dc9ef18c040f6)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
@@ -395,6 +395,8 @@
  *************************************************************************/
 static void transitionToNewOperationMode( TD_OP_MODE_T newMode )
 {
+    SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_OP_MODE_CHANGE, lastMode, newMode )
+
     // Setup for new operating mode
     switch ( newMode )
     {
Index: firmware/App/TDCommon.h
===================================================================
diff -u -rbccdf42b4195cd774760bc75dc21ab78727f9a4a -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision bccdf42b4195cd774760bc75dc21ab78727f9a4a)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
@@ -41,7 +41,7 @@
 //    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
     #define TEST_NO_PRESSURE_CHECKS         1           // Alpha test with no pressure sensor checks
 //    #define TEST_NO_STOP_CONSUME_CHECK      1           // Alpha test with no check for stop button timeout
-    #define ASN_DEMO                        1
+//    #define ASN_DEMO                        1
 
     #include <stdio.h>
     #include <strings.h>