Index: firmware/App/Controllers/AirTrap.h
===================================================================
diff -u -reffc2a8283d6528109b2401bbad70dc554db4e53 -r18981bf79f6c19a1822f003084e80547c21cdb62
--- firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision effc2a8283d6528109b2401bbad70dc554db4e53)
+++ firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision 18981bf79f6c19a1822f003084e80547c21cdb62)
@@ -33,16 +33,20 @@
 
 // ********** public definitions **********
 
+#pragma pack(push, 1)
 /// Payload record structure for air trap data broadcast message
 typedef struct
 {
     U32 h17State;                           ///< Lower air trap level sensor state
     U32 h16State;                           ///< Upper air trap level sensor state
     U32 h17RawState;                        ///< Raw Lower air trap level sensor state
     U32 h16RawState;                        ///< Raw Upper air trap level sensor state
-    U32 h13State;                           ///< Is air trap valve open or closed
-    BOOL controlling;                       ///< Flag indicates whether air trap level is being auto controlled
+    U32 h13State;                           ///< Is air trap intake valve open or closed
+    U32 h20State;                           ///< Is air trap outlet valve open or closed
+    BOOL isAutoControlling;                 ///< Flag indicates whether air trap level is being auto controlled
+    U32 airTrapState;
 } AIR_TRAP_PAYLOAD_T;
+#pragma pack(pop)
 
 // ********** public function prototypes **********
 
@@ -57,6 +61,9 @@
 BOOL isAirTrapControlling( void );
 
 BOOL testAirTrapDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testSetAirTrapControl( MESSAGE_T *message );
+BOOL testAirPumpPowerRaiseOverride( MESSAGE_T *message );
+BOOL testAirPumpPowerLowerOverride( MESSAGE_T *message );
 
 /**@}*/