Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -rc1b9ac0dbf2196280895d2e440dd7ac288ac8424 -r5ba2bb4541aff5e9b870dbd8921d86567a02cd67
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision c1b9ac0dbf2196280895d2e440dd7ac288ac8424)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision 5ba2bb4541aff5e9b870dbd8921d86567a02cd67)
@@ -92,6 +92,10 @@
     if ( state < NUM_OF_AIR_PUMP_MOTOR_STATES )
     {
         gioSetBit( hetPORT1, AIR_PUMP_GPIO_PIN, (U32)state );
+        if ( state != currentAirPumpMotorState )
+        {
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_PUMP_ON_OFF, (U32)state, 0 );
+        }
         currentAirPumpMotorState = state;
     }
     else
Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rd608769332d4ffe19f39a18caca14d6155f13e0a -r5ba2bb4541aff5e9b870dbd8921d86567a02cd67
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision d608769332d4ffe19f39a18caca14d6155f13e0a)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 5ba2bb4541aff5e9b870dbd8921d86567a02cd67)
@@ -366,6 +366,7 @@
 
         setValveAirTrap( STATE_OPEN );
         fillStartTime = getMSTimerCount();
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, 0, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
     }