Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file AirTrap.c
+* @file    AirTrap.c
 *
-* @author (last) Sean Nash
-* @date (last) 08-Oct-2020
+* @author  (last)      Sean Nash
+* @date    (last)      13-Aug-2021
 *
-* @author (original) Sean Nash
-* @date (original) 16-Sep-2020
+* @author  (original)  Sean Nash
+* @date    (original)  16-Sep-2020
 *
 ***************************************************************************/
 
@@ -384,10 +384,12 @@
     // Publish air trap data on interval
     if ( ++airTrapDataPublicationTimerCounter >= getU32OverrideValue( &airTrapDataPublishInterval ) )
     {
-        AIR_TRAP_LEVELS_T lowLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
-        AIR_TRAP_LEVELS_T highLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
+        AIR_TRAP_PAYLOAD_T data;
 
-        broadcastAirTrapData( lowLevel, highLevel );
+        data.lowerLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
+        data.upperLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
+
+        broadcastData( MSG_ID_HD_AIR_TRAP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( AIR_TRAP_PAYLOAD_T ) );
         airTrapDataPublicationTimerCounter = 0;
     }
 }