From 02c078530237331ca9c85fa37c4461b75b547b9c Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Mon, 1 Feb 2016 20:17:51 -0500
Subject: [PATCH] Skip "Message Adjustment" if the messages are to/from the UDP
 Bridge.

---
 src/FirmwarePlugin/APM/APMFirmwarePlugin.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
index 16deec949..d18c6c22f 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
@@ -217,6 +217,11 @@ int APMFirmwarePlugin::manualControlReservedButtonCount(void)
 
 void APMFirmwarePlugin::adjustMavlinkMessage(Vehicle* vehicle, mavlink_message_t* message)
 {
+    //-- Don't process messages to/from UDP Bridge. It doesn't suffer from these issues
+    if (message->compid == MAV_COMP_ID_UDP_BRIDGE) {
+        return;
+    }
+
     if (message->msgid == MAVLINK_MSG_ID_PARAM_VALUE) {
         mavlink_param_value_t paramValue;
         mavlink_param_union_t paramUnion;
-- 
2.22.0