From 8f2cecae4da751d66ec103a6c0866984626fa6b0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 30 Apr 2012 12:27:19 +1000
Subject: [PATCH] MAVLink: re-generated with new pygen

this moves the enums to make them less order sensitive
---
 .../v0.9/ardupilotmega/ardupilotmega.h        | 26 +++++++++----------
 .../mavlink/v0.9/ardupilotmega/version.h      |  2 +-
 .../include/mavlink/v0.9/common/common.h      | 26 +++++++++----------
 .../include/mavlink/v0.9/common/version.h     |  2 +-
 .../v1.0/ardupilotmega/ardupilotmega.h        | 26 +++++++++----------
 .../mavlink/v1.0/ardupilotmega/version.h      |  2 +-
 .../include/mavlink/v1.0/common/common.h      | 26 +++++++++----------
 .../include/mavlink/v1.0/common/version.h     |  2 +-
 8 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
index 4148b5a6a..311858ffd 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
@@ -27,19 +27,6 @@ extern "C" {
 
 #define MAVLINK_ENABLED_ARDUPILOTMEGA
 
-#include "../common/common.h"
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
 // ENUM DEFINITIONS
 
 
@@ -130,6 +117,19 @@ enum FENCE_BREACH
 };
 #endif
 
+#include "../common/common.h"
+
+// MAVLINK VERSION
+
+#ifndef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
+#if (MAVLINK_VERSION == 0)
+#undef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
 // MESSAGE DEFINITIONS
 #include "./mavlink_msg_sensor_offsets.h"
 #include "./mavlink_msg_set_mag_offsets.h"
diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
index 319b4dbed..336dbe14e 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Tue Apr 24 10:29:51 2012"
+#define MAVLINK_BUILD_DATE "Mon Apr 30 11:40:11 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/common.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/common.h
index 210baad49..471202f48 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/common.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/common.h
@@ -27,19 +27,6 @@ extern "C" {
 
 #define MAVLINK_ENABLED_COMMON
 
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
 // ENUM DEFINITIONS
 
 
@@ -81,6 +68,19 @@ enum MAV_ROI
 };
 #endif
 
+
+
+// MAVLINK VERSION
+
+#ifndef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
+#if (MAVLINK_VERSION == 0)
+#undef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
 // MESSAGE DEFINITIONS
 #include "./mavlink_msg_heartbeat.h"
 #include "./mavlink_msg_boot.h"
diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
index 872c25a67..9e6e7dbe4 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Tue Apr 24 10:29:51 2012"
+#define MAVLINK_BUILD_DATE "Mon Apr 30 11:40:11 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
index a77a45385..7157bba7d 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
@@ -27,19 +27,6 @@ extern "C" {
 
 #define MAVLINK_ENABLED_ARDUPILOTMEGA
 
-#include "../common/common.h"
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
 // ENUM DEFINITIONS
 
 
@@ -127,6 +114,19 @@ enum FENCE_BREACH
 };
 #endif
 
+#include "../common/common.h"
+
+// MAVLINK VERSION
+
+#ifndef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
+#if (MAVLINK_VERSION == 0)
+#undef MAVLINK_VERSION
+#define MAVLINK_VERSION 2
+#endif
+
 // MESSAGE DEFINITIONS
 #include "./mavlink_msg_sensor_offsets.h"
 #include "./mavlink_msg_set_mag_offsets.h"
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
index 2f6014644..bee5bec18 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Tue Apr 24 10:29:51 2012"
+#define MAVLINK_BUILD_DATE "Mon Apr 30 11:40:12 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h
index d9851110d..910e148ae 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h
@@ -27,19 +27,6 @@ extern "C" {
 
 #define MAVLINK_ENABLED_COMMON
 
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
 // ENUM DEFINITIONS
 
 
@@ -364,6 +351,19 @@ enum MAV_SEVERITY
 };
 #endif
 
+
+
+// MAVLINK VERSION
+
+#ifndef MAVLINK_VERSION
+#define MAVLINK_VERSION 3
+#endif
+
+#if (MAVLINK_VERSION == 0)
+#undef MAVLINK_VERSION
+#define MAVLINK_VERSION 3
+#endif
+
 // MESSAGE DEFINITIONS
 #include "./mavlink_msg_heartbeat.h"
 #include "./mavlink_msg_sys_status.h"
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
index 3cd0335ed..c888d75e3 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Tue Apr 24 10:29:51 2012"
+#define MAVLINK_BUILD_DATE "Mon Apr 30 11:40:12 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
-- 
GitLab