Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -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;
     }
 }