From 2e7939cbf43d67171a38fc7b5cef9817053fa884 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 31 Aug 2012 12:09:52 +1000
Subject: [PATCH] Mavlink: enable MAVLINK_SEPARATE_HELPERS

this fixes a seq number problem with SIMSTATE packets
---
 libraries/GCS_MAVLink/GCS_MAVLink.cpp | 4 ++++
 libraries/GCS_MAVLink/GCS_MAVLink.h   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
index f906724f06..d88ca94cb3 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@@ -15,6 +15,10 @@ version 2.1 of the License, or (at your option) any later version.
 #include <AP_Common.h>
 #include <GCS_MAVLink.h>
 
+#ifdef MAVLINK_SEPARATE_HELPERS
+#include "include/mavlink/v1.0/mavlink_helpers.h"
+#endif
+
 
 BetterStream	*mavlink_comm_0_port;
 BetterStream	*mavlink_comm_1_port;
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h
index 6efa46f471..818725e96a 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@@ -10,7 +10,7 @@
 
 // we have separate helpers disabled to make it possible
 // to select MAVLink 1.0 in the arduino GUI build
-//#define MAVLINK_SEPARATE_HELPERS
+#define MAVLINK_SEPARATE_HELPERS
 
 #include "include/mavlink/v1.0/ardupilotmega/version.h"