Updated to MAVLink v1.0.9, deleted v0.9 messages (anyway unsupported)

217 files changed, 1403 insertions, 45467 deletions

diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h b/mavlink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
deleted file mode 100644
index 4148b5a6a..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from ardupilotmega.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef ARDUPILOTMEGA_H
-#define ARDUPILOTMEGA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 4, 8, 14, 8, 28, 3, 32, 0, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 19, 2, 23, 21, 0, 37, 26, 101, 26, 16, 32, 32, 37, 32, 11, 17, 17, 16, 18, 36, 4, 4, 2, 2, 4, 2, 2, 3, 14, 12, 18, 16, 8, 27, 25, 18, 18, 24, 24, 0, 0, 0, 26, 16, 36, 5, 6, 56, 26, 21, 18, 0, 0, 18, 20, 20, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 8, 4, 12, 15, 13, 6, 15, 14, 0, 12, 3, 8, 28, 36, 3, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 14, 14, 51, 5}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 39, 190, 92, 191, 217, 104, 119, 0, 219, 60, 186, 10, 0, 0, 0, 0, 0, 0, 0, 89, 159, 162, 121, 0, 149, 222, 110, 179, 136, 66, 126, 185, 147, 112, 252, 162, 215, 229, 128, 9, 106, 101, 213, 4, 229, 21, 214, 215, 14, 206, 50, 157, 126, 108, 213, 95, 5, 127, 0, 0, 0, 57, 126, 130, 119, 193, 191, 236, 158, 143, 0, 0, 104, 123, 131, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 29, 208, 188, 118, 242, 19, 97, 233, 0, 18, 68, 136, 127, 42, 21, 93, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 224, 60, 106, 7}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_BOOT, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACTION_ACK, MAVLINK_MESSAGE_INFO_ACTION, MAVLINK_MESSAGE_INFO_SET_MODE, MAVLINK_MESSAGE_INFO_SET_NAV_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_LOCAL_POSITION, MAVLINK_MESSAGE_INFO_GPS_RAW, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_WAYPOINT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST, MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST, MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT, MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL, MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED, MAVLINK_MESSAGE_INFO_WAYPOINT_ACK, MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_CONTROL_STATUS, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_POSITION_TARGET, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, MAVLINK_MESSAGE_INFO_SET_ALTITUDE, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_VFR_HUD, MAVLINK_MESSAGE_INFO_COMMAND, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SENSOR_OFFSETS, MAVLINK_MESSAGE_INFO_SET_MAG_OFFSETS, MAVLINK_MESSAGE_INFO_MEMINFO, MAVLINK_MESSAGE_INFO_AP_ADC, MAVLINK_MESSAGE_INFO_DIGICAM_CONFIGURE, MAVLINK_MESSAGE_INFO_DIGICAM_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_CONFIGURE, MAVLINK_MESSAGE_INFO_MOUNT_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_STATUS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_FENCE_POINT, MAVLINK_MESSAGE_INFO_FENCE_FETCH_POINT, MAVLINK_MESSAGE_INFO_FENCE_STATUS, MAVLINK_MESSAGE_INFO_AHRS, MAVLINK_MESSAGE_INFO_SIMSTATE, MAVLINK_MESSAGE_INFO_HWSTATUS, MAVLINK_MESSAGE_INFO_RADIO, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG}
-#endif
-
-#include "../protocol.h"
-
-#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
-
-
-/** @brief Enumeration of possible mount operation modes */
-#ifndef HAVE_ENUM_MAV_MOUNT_MODE
-#define HAVE_ENUM_MAV_MOUNT_MODE
-enum MAV_MOUNT_MODE
-{
-	MAV_MOUNT_MODE_RETRACT=0, /* Load and keep safe position (Roll,Pitch,Yaw) from EEPROM and stop stabilization | */
-	MAV_MOUNT_MODE_NEUTRAL=1, /* Load and keep neutral position (Roll,Pitch,Yaw) from EEPROM. | */
-	MAV_MOUNT_MODE_MAVLINK_TARGETING=2, /* Load neutral position and start MAVLink Roll,Pitch,Yaw control with stabilization | */
-	MAV_MOUNT_MODE_RC_TARGETING=3, /* Load neutral position and start RC Roll,Pitch,Yaw control with stabilization | */
-	MAV_MOUNT_MODE_GPS_POINT=4, /* Load neutral position and start to point to Lat,Lon,Alt | */
-	MAV_MOUNT_MODE_ENUM_END=5, /*  | */
-};
-#endif
-
-/** @brief  */
-#ifndef HAVE_ENUM_MAV_CMD
-#define HAVE_ENUM_MAV_CMD
-enum MAV_CMD
-{
-	MAV_CMD_NAV_WAYPOINT=16, /* Navigate to waypoint. |Hold time in decimal seconds. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Acceptance radius in meters (if the sphere with this radius is hit, the waypoint counts as reached)| 0 to pass through the WP, if > 0 radius in meters to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at waypoint (rotary wing)| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_UNLIM=17, /* Loiter around this waypoint an unlimited amount of time |Empty| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_TURNS=18, /* Loiter around this waypoint for X turns |Turns| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_TIME=19, /* Loiter around this waypoint for X seconds |Seconds (decimal)| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_RETURN_TO_LAUNCH=20, /* Return to launch location |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_NAV_LAND=21, /* Land at location |Empty| Empty| Empty| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_TAKEOFF=22, /* Takeoff from ground / hand |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Empty| Yaw angle (if magnetometer present), ignored without magnetometer| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_ROI=80, /* Sets the region of interest (ROI) for a sensor set or the
-            vehicle itself. This can then be used by the vehicles control
-            system to control the vehicle attitude and the attitude of various
-            sensors such as cameras. |Region of intereset mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple ROI's)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z|  */
-	MAV_CMD_NAV_PATHPLANNING=81, /* Control autonomous path planning on the MAV. |0: Disable local obstacle avoidance / local path planning (without resetting map), 1: Enable local path planning, 2: Enable and reset local path planning| 0: Disable full path planning (without resetting map), 1: Enable, 2: Enable and reset map/occupancy grid, 3: Enable and reset planned route, but not occupancy grid| Empty| Yaw angle at goal, in compass degrees, [0..360]| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal|  */
-	MAV_CMD_NAV_LAST=95, /* NOP - This command is only used to mark the upper limit of the NAV/ACTION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_DELAY=112, /* Delay mission state machine. |Delay in seconds (decimal)| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_CHANGE_ALT=113, /* Ascend/descend at rate.  Delay mission state machine until desired altitude reached. |Descent / Ascend rate (m/s)| Empty| Empty| Empty| Empty| Empty| Finish Altitude|  */
-	MAV_CMD_CONDITION_DISTANCE=114, /* Delay mission state machine until within desired distance of next NAV point. |Distance (meters)| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_YAW=115, /* Reach a certain target angle. |target angle: [0-360], 0 is north| speed during yaw change:[deg per second]| direction: negative: counter clockwise, positive: clockwise [-1,1]| relative offset or absolute angle: [ 1,0]| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_LAST=159, /* NOP - This command is only used to mark the upper limit of the CONDITION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_MODE=176, /* Set system mode. |Mode, as defined by ENUM MAV_MODE| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_JUMP=177, /* Jump to the desired command in the mission list.  Repeat this action only the specified number of times |Sequence number| Repeat count| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_CHANGE_SPEED=178, /* Change speed and/or throttle set points. |Speed type (0=Airspeed, 1=Ground Speed)| Speed  (m/s, -1 indicates no change)| Throttle  ( Percent, -1 indicates no change)| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_HOME=179, /* Changes the home location either to the current location or a specified location. |Use current (1=use current location, 0=use specified location)| Empty| Empty| Empty| Latitude| Longitude| Altitude|  */
-	MAV_CMD_DO_SET_PARAMETER=180, /* Set a system parameter.  Caution!  Use of this command requires knowledge of the numeric enumeration value of the parameter. |Parameter number| Parameter value| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_RELAY=181, /* Set a relay to a condition. |Relay number| Setting (1=on, 0=off, others possible depending on system hardware)| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_REPEAT_RELAY=182, /* Cycle a relay on and off for a desired number of cyles with a desired period. |Relay number| Cycle count| Cycle time (seconds, decimal)| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_SERVO=183, /* Set a servo to a desired PWM value. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_REPEAT_SERVO=184, /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Cycle count| Cycle time (seconds)| Empty| Empty| Empty|  */
-	MAV_CMD_DO_CONTROL_VIDEO=200, /* Control onboard camera capturing. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds (decimal)| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_ROI=201, /* Sets the region of interest (ROI) for a sensor set or the
-                    vehicle itself. This can then be used by the vehicles control
-                    system to control the vehicle attitude and the attitude of various
-                    devices such as cameras.
-                 |Region of interest mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple cameras etc.)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z|  */
-	MAV_CMD_DO_DIGICAM_CONFIGURE=202, /* Mission command to configure an on-board camera controller system. |Modes: P, TV, AV, M, Etc| Shutter speed: Divisor number for one second| Aperture: F stop number| ISO number e.g. 80, 100, 200, Etc| Exposure type enumerator| Command Identity| Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)|  */
-	MAV_CMD_DO_DIGICAM_CONTROL=203, /* Mission command to control an on-board camera controller system. |Session control e.g. show/hide lens| Zoom's absolute position| Zooming step value to offset zoom from the current position| Focus Locking, Unlocking or Re-locking| Shooting Command| Command Identity| Empty|  */
-	MAV_CMD_DO_MOUNT_CONFIGURE=204, /* Mission command to configure a camera or antenna mount |Mount operation mode (see MAV_MOUNT_MODE enum)| stabilize roll? (1 = yes, 0 = no)| stabilize pitch? (1 = yes, 0 = no)| stabilize yaw? (1 = yes, 0 = no)| Empty| Empty| Empty|  */
-	MAV_CMD_DO_MOUNT_CONTROL=205, /* Mission command to control a camera or antenna mount |pitch(deg*100) or lat, depending on mount mode.| roll(deg*100) or lon depending on mount mode| yaw(deg*100) or alt (in cm) depending on mount mode| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_LAST=240, /* NOP - This command is only used to mark the upper limit of the DO commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_PREFLIGHT_CALIBRATION=241, /* Trigger calibration. This command will be only accepted if in pre-flight mode. |Gyro calibration: 0: no, 1: yes| Magnetometer calibration: 0: no, 1: yes| Ground pressure: 0: no, 1: yes| Radio calibration: 0: no, 1: yes| Empty| Empty| Empty|  */
-	MAV_CMD_PREFLIGHT_STORAGE=245, /* Request storage of different parameter values and logs. This command will be only accepted if in pre-flight mode. |Parameter storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Mission storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Reserved| Reserved| Empty| Empty| Empty|  */
-	MAV_CMD_ENUM_END=246, /*  | */
-};
-#endif
-
-/** @brief  */
-#ifndef HAVE_ENUM_FENCE_ACTION
-#define HAVE_ENUM_FENCE_ACTION
-enum FENCE_ACTION
-{
-	FENCE_ACTION_NONE=0, /* Disable fenced mode | */
-	FENCE_ACTION_GUIDED=1, /* Switched to guided mode to return point (fence point 0) | */
-	FENCE_ACTION_ENUM_END=2, /*  | */
-};
-#endif
-
-/** @brief  */
-#ifndef HAVE_ENUM_FENCE_BREACH
-#define HAVE_ENUM_FENCE_BREACH
-enum FENCE_BREACH
-{
-	FENCE_BREACH_NONE=0, /* No last fence breach | */
-	FENCE_BREACH_MINALT=1, /* Breached minimum altitude | */
-	FENCE_BREACH_MAXALT=2, /* Breached minimum altitude | */
-	FENCE_BREACH_BOUNDARY=3, /* Breached fence boundary | */
-	FENCE_BREACH_ENUM_END=4, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_sensor_offsets.h"
-#include "./mavlink_msg_set_mag_offsets.h"
-#include "./mavlink_msg_meminfo.h"
-#include "./mavlink_msg_ap_adc.h"
-#include "./mavlink_msg_digicam_configure.h"
-#include "./mavlink_msg_digicam_control.h"
-#include "./mavlink_msg_mount_configure.h"
-#include "./mavlink_msg_mount_control.h"
-#include "./mavlink_msg_mount_status.h"
-#include "./mavlink_msg_fence_point.h"
-#include "./mavlink_msg_fence_fetch_point.h"
-#include "./mavlink_msg_fence_status.h"
-#include "./mavlink_msg_ahrs.h"
-#include "./mavlink_msg_simstate.h"
-#include "./mavlink_msg_hwstatus.h"
-#include "./mavlink_msg_radio.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // ARDUPILOTMEGA_H
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink.h
deleted file mode 100644
index 72e0248d9..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ardupilotmega.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "ardupilotmega.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ahrs.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ahrs.h
deleted file mode 100644
index 9cb06e6b1..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ahrs.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE AHRS PACKING
-
-#define MAVLINK_MSG_ID_AHRS 163
-
-typedef struct __mavlink_ahrs_t
-{
- float omegaIx; ///< X gyro drift estimate rad/s
- float omegaIy; ///< Y gyro drift estimate rad/s
- float omegaIz; ///< Z gyro drift estimate rad/s
- float accel_weight; ///< average accel_weight
- float renorm_val; ///< average renormalisation value
- float error_rp; ///< average error_roll_pitch value
- float error_yaw; ///< average error_yaw value
-} mavlink_ahrs_t;
-
-#define MAVLINK_MSG_ID_AHRS_LEN 28
-#define MAVLINK_MSG_ID_163_LEN 28
-
-
-
-#define MAVLINK_MESSAGE_INFO_AHRS { \
-	"AHRS", \
-	7, \
-	{  { "omegaIx", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_ahrs_t, omegaIx) }, \
-         { "omegaIy", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_ahrs_t, omegaIy) }, \
-         { "omegaIz", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_ahrs_t, omegaIz) }, \
-         { "accel_weight", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_ahrs_t, accel_weight) }, \
-         { "renorm_val", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_ahrs_t, renorm_val) }, \
-         { "error_rp", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_ahrs_t, error_rp) }, \
-         { "error_yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_ahrs_t, error_yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ahrs message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param omegaIx X gyro drift estimate rad/s
- * @param omegaIy Y gyro drift estimate rad/s
- * @param omegaIz Z gyro drift estimate rad/s
- * @param accel_weight average accel_weight
- * @param renorm_val average renormalisation value
- * @param error_rp average error_roll_pitch value
- * @param error_yaw average error_yaw value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ahrs_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_float(buf, 0, omegaIx);
-	_mav_put_float(buf, 4, omegaIy);
-	_mav_put_float(buf, 8, omegaIz);
-	_mav_put_float(buf, 12, accel_weight);
-	_mav_put_float(buf, 16, renorm_val);
-	_mav_put_float(buf, 20, error_rp);
-	_mav_put_float(buf, 24, error_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
-#else
-	mavlink_ahrs_t packet;
-	packet.omegaIx = omegaIx;
-	packet.omegaIy = omegaIy;
-	packet.omegaIz = omegaIz;
-	packet.accel_weight = accel_weight;
-	packet.renorm_val = renorm_val;
-	packet.error_rp = error_rp;
-	packet.error_yaw = error_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AHRS;
-	return mavlink_finalize_message(msg, system_id, component_id, 28);
-}
-
-/**
- * @brief Pack a ahrs message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param omegaIx X gyro drift estimate rad/s
- * @param omegaIy Y gyro drift estimate rad/s
- * @param omegaIz Z gyro drift estimate rad/s
- * @param accel_weight average accel_weight
- * @param renorm_val average renormalisation value
- * @param error_rp average error_roll_pitch value
- * @param error_yaw average error_yaw value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ahrs_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float omegaIx,float omegaIy,float omegaIz,float accel_weight,float renorm_val,float error_rp,float error_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_float(buf, 0, omegaIx);
-	_mav_put_float(buf, 4, omegaIy);
-	_mav_put_float(buf, 8, omegaIz);
-	_mav_put_float(buf, 12, accel_weight);
-	_mav_put_float(buf, 16, renorm_val);
-	_mav_put_float(buf, 20, error_rp);
-	_mav_put_float(buf, 24, error_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
-#else
-	mavlink_ahrs_t packet;
-	packet.omegaIx = omegaIx;
-	packet.omegaIy = omegaIy;
-	packet.omegaIz = omegaIz;
-	packet.accel_weight = accel_weight;
-	packet.renorm_val = renorm_val;
-	packet.error_rp = error_rp;
-	packet.error_yaw = error_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AHRS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 28);
-}
-
-/**
- * @brief Encode a ahrs struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ahrs C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ahrs_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ahrs_t* ahrs)
-{
-	return mavlink_msg_ahrs_pack(system_id, component_id, msg, ahrs->omegaIx, ahrs->omegaIy, ahrs->omegaIz, ahrs->accel_weight, ahrs->renorm_val, ahrs->error_rp, ahrs->error_yaw);
-}
-
-/**
- * @brief Send a ahrs message
- * @param chan MAVLink channel to send the message
- *
- * @param omegaIx X gyro drift estimate rad/s
- * @param omegaIy Y gyro drift estimate rad/s
- * @param omegaIz Z gyro drift estimate rad/s
- * @param accel_weight average accel_weight
- * @param renorm_val average renormalisation value
- * @param error_rp average error_roll_pitch value
- * @param error_yaw average error_yaw value
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ahrs_send(mavlink_channel_t chan, float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_float(buf, 0, omegaIx);
-	_mav_put_float(buf, 4, omegaIy);
-	_mav_put_float(buf, 8, omegaIz);
-	_mav_put_float(buf, 12, accel_weight);
-	_mav_put_float(buf, 16, renorm_val);
-	_mav_put_float(buf, 20, error_rp);
-	_mav_put_float(buf, 24, error_yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AHRS, buf, 28);
-#else
-	mavlink_ahrs_t packet;
-	packet.omegaIx = omegaIx;
-	packet.omegaIy = omegaIy;
-	packet.omegaIz = omegaIz;
-	packet.accel_weight = accel_weight;
-	packet.renorm_val = renorm_val;
-	packet.error_rp = error_rp;
-	packet.error_yaw = error_yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AHRS, (const char *)&packet, 28);
-#endif
-}
-
-#endif
-
-// MESSAGE AHRS UNPACKING
-
-
-/**
- * @brief Get field omegaIx from ahrs message
- *
- * @return X gyro drift estimate rad/s
- */
-static inline float mavlink_msg_ahrs_get_omegaIx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field omegaIy from ahrs message
- *
- * @return Y gyro drift estimate rad/s
- */
-static inline float mavlink_msg_ahrs_get_omegaIy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field omegaIz from ahrs message
- *
- * @return Z gyro drift estimate rad/s
- */
-static inline float mavlink_msg_ahrs_get_omegaIz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field accel_weight from ahrs message
- *
- * @return average accel_weight
- */
-static inline float mavlink_msg_ahrs_get_accel_weight(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field renorm_val from ahrs message
- *
- * @return average renormalisation value
- */
-static inline float mavlink_msg_ahrs_get_renorm_val(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field error_rp from ahrs message
- *
- * @return average error_roll_pitch value
- */
-static inline float mavlink_msg_ahrs_get_error_rp(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field error_yaw from ahrs message
- *
- * @return average error_yaw value
- */
-static inline float mavlink_msg_ahrs_get_error_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Decode a ahrs message into a struct
- *
- * @param msg The message to decode
- * @param ahrs C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ahrs_decode(const mavlink_message_t* msg, mavlink_ahrs_t* ahrs)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ahrs->omegaIx = mavlink_msg_ahrs_get_omegaIx(msg);
-	ahrs->omegaIy = mavlink_msg_ahrs_get_omegaIy(msg);
-	ahrs->omegaIz = mavlink_msg_ahrs_get_omegaIz(msg);
-	ahrs->accel_weight = mavlink_msg_ahrs_get_accel_weight(msg);
-	ahrs->renorm_val = mavlink_msg_ahrs_get_renorm_val(msg);
-	ahrs->error_rp = mavlink_msg_ahrs_get_error_rp(msg);
-	ahrs->error_yaw = mavlink_msg_ahrs_get_error_yaw(msg);
-#else
-	memcpy(ahrs, _MAV_PAYLOAD(msg), 28);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ap_adc.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ap_adc.h
deleted file mode 100644
index 07eacc9a9..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_ap_adc.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE AP_ADC PACKING
-
-#define MAVLINK_MSG_ID_AP_ADC 153
-
-typedef struct __mavlink_ap_adc_t
-{
- uint16_t adc1; ///< ADC output 1
- uint16_t adc2; ///< ADC output 2
- uint16_t adc3; ///< ADC output 3
- uint16_t adc4; ///< ADC output 4
- uint16_t adc5; ///< ADC output 5
- uint16_t adc6; ///< ADC output 6
-} mavlink_ap_adc_t;
-
-#define MAVLINK_MSG_ID_AP_ADC_LEN 12
-#define MAVLINK_MSG_ID_153_LEN 12
-
-
-
-#define MAVLINK_MESSAGE_INFO_AP_ADC { \
-	"AP_ADC", \
-	6, \
-	{  { "adc1", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_ap_adc_t, adc1) }, \
-         { "adc2", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_ap_adc_t, adc2) }, \
-         { "adc3", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_ap_adc_t, adc3) }, \
-         { "adc4", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_ap_adc_t, adc4) }, \
-         { "adc5", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_ap_adc_t, adc5) }, \
-         { "adc6", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_ap_adc_t, adc6) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ap_adc message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param adc1 ADC output 1
- * @param adc2 ADC output 2
- * @param adc3 ADC output 3
- * @param adc4 ADC output 4
- * @param adc5 ADC output 5
- * @param adc6 ADC output 6
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ap_adc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t adc1, uint16_t adc2, uint16_t adc3, uint16_t adc4, uint16_t adc5, uint16_t adc6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, adc5);
-	_mav_put_uint16_t(buf, 10, adc6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_ap_adc_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.adc5 = adc5;
-	packet.adc6 = adc6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AP_ADC;
-	return mavlink_finalize_message(msg, system_id, component_id, 12);
-}
-
-/**
- * @brief Pack a ap_adc message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param adc1 ADC output 1
- * @param adc2 ADC output 2
- * @param adc3 ADC output 3
- * @param adc4 ADC output 4
- * @param adc5 ADC output 5
- * @param adc6 ADC output 6
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ap_adc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t adc1,uint16_t adc2,uint16_t adc3,uint16_t adc4,uint16_t adc5,uint16_t adc6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, adc5);
-	_mav_put_uint16_t(buf, 10, adc6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_ap_adc_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.adc5 = adc5;
-	packet.adc6 = adc6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AP_ADC;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12);
-}
-
-/**
- * @brief Encode a ap_adc struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ap_adc C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ap_adc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ap_adc_t* ap_adc)
-{
-	return mavlink_msg_ap_adc_pack(system_id, component_id, msg, ap_adc->adc1, ap_adc->adc2, ap_adc->adc3, ap_adc->adc4, ap_adc->adc5, ap_adc->adc6);
-}
-
-/**
- * @brief Send a ap_adc message
- * @param chan MAVLink channel to send the message
- *
- * @param adc1 ADC output 1
- * @param adc2 ADC output 2
- * @param adc3 ADC output 3
- * @param adc4 ADC output 4
- * @param adc5 ADC output 5
- * @param adc6 ADC output 6
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ap_adc_send(mavlink_channel_t chan, uint16_t adc1, uint16_t adc2, uint16_t adc3, uint16_t adc4, uint16_t adc5, uint16_t adc6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, adc5);
-	_mav_put_uint16_t(buf, 10, adc6);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AP_ADC, buf, 12);
-#else
-	mavlink_ap_adc_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.adc5 = adc5;
-	packet.adc6 = adc6;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AP_ADC, (const char *)&packet, 12);
-#endif
-}
-
-#endif
-
-// MESSAGE AP_ADC UNPACKING
-
-
-/**
- * @brief Get field adc1 from ap_adc message
- *
- * @return ADC output 1
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field adc2 from ap_adc message
- *
- * @return ADC output 2
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field adc3 from ap_adc message
- *
- * @return ADC output 3
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field adc4 from ap_adc message
- *
- * @return ADC output 4
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  6);
-}
-
-/**
- * @brief Get field adc5 from ap_adc message
- *
- * @return ADC output 5
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc5(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Get field adc6 from ap_adc message
- *
- * @return ADC output 6
- */
-static inline uint16_t mavlink_msg_ap_adc_get_adc6(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Decode a ap_adc message into a struct
- *
- * @param msg The message to decode
- * @param ap_adc C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ap_adc_decode(const mavlink_message_t* msg, mavlink_ap_adc_t* ap_adc)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ap_adc->adc1 = mavlink_msg_ap_adc_get_adc1(msg);
-	ap_adc->adc2 = mavlink_msg_ap_adc_get_adc2(msg);
-	ap_adc->adc3 = mavlink_msg_ap_adc_get_adc3(msg);
-	ap_adc->adc4 = mavlink_msg_ap_adc_get_adc4(msg);
-	ap_adc->adc5 = mavlink_msg_ap_adc_get_adc5(msg);
-	ap_adc->adc6 = mavlink_msg_ap_adc_get_adc6(msg);
-#else
-	memcpy(ap_adc, _MAV_PAYLOAD(msg), 12);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_configure.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_configure.h
deleted file mode 100644
index 8df0a00d8..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_configure.h
+++ /dev/null
@@ -1,364 +0,0 @@
-// MESSAGE DIGICAM_CONFIGURE PACKING
-
-#define MAVLINK_MSG_ID_DIGICAM_CONFIGURE 154
-
-typedef struct __mavlink_digicam_configure_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t mode; ///< Mode enumeration from 1 to N //P, TV, AV, M, Etc (0 means ignore)
- uint16_t shutter_speed; ///< Divisor number //e.g. 1000 means 1/1000 (0 means ignore)
- uint8_t aperture; ///< F stop number x 10 //e.g. 28 means 2.8 (0 means ignore)
- uint8_t iso; ///< ISO enumeration from 1 to N //e.g. 80, 100, 200, Etc (0 means ignore)
- uint8_t exposure_type; ///< Exposure type enumeration from 1 to N (0 means ignore)
- uint8_t command_id; ///< Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- uint8_t engine_cut_off; ///< Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)
- uint8_t extra_param; ///< Extra parameters enumeration (0 means ignore)
- float extra_value; ///< Correspondent value to given extra_param
-} mavlink_digicam_configure_t;
-
-#define MAVLINK_MSG_ID_DIGICAM_CONFIGURE_LEN 15
-#define MAVLINK_MSG_ID_154_LEN 15
-
-
-
-#define MAVLINK_MESSAGE_INFO_DIGICAM_CONFIGURE { \
-	"DIGICAM_CONFIGURE", \
-	11, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_digicam_configure_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_digicam_configure_t, target_component) }, \
-         { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_digicam_configure_t, mode) }, \
-         { "shutter_speed", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_digicam_configure_t, shutter_speed) }, \
-         { "aperture", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_digicam_configure_t, aperture) }, \
-         { "iso", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_digicam_configure_t, iso) }, \
-         { "exposure_type", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_digicam_configure_t, exposure_type) }, \
-         { "command_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_digicam_configure_t, command_id) }, \
-         { "engine_cut_off", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_digicam_configure_t, engine_cut_off) }, \
-         { "extra_param", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_digicam_configure_t, extra_param) }, \
-         { "extra_value", NULL, MAVLINK_TYPE_FLOAT, 0, 11, offsetof(mavlink_digicam_configure_t, extra_value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a digicam_configure message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mode Mode enumeration from 1 to N //P, TV, AV, M, Etc (0 means ignore)
- * @param shutter_speed Divisor number //e.g. 1000 means 1/1000 (0 means ignore)
- * @param aperture F stop number x 10 //e.g. 28 means 2.8 (0 means ignore)
- * @param iso ISO enumeration from 1 to N //e.g. 80, 100, 200, Etc (0 means ignore)
- * @param exposure_type Exposure type enumeration from 1 to N (0 means ignore)
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param engine_cut_off Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_digicam_configure_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t mode, uint16_t shutter_speed, uint8_t aperture, uint8_t iso, uint8_t exposure_type, uint8_t command_id, uint8_t engine_cut_off, uint8_t extra_param, float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mode);
-	_mav_put_uint16_t(buf, 3, shutter_speed);
-	_mav_put_uint8_t(buf, 5, aperture);
-	_mav_put_uint8_t(buf, 6, iso);
-	_mav_put_uint8_t(buf, 7, exposure_type);
-	_mav_put_uint8_t(buf, 8, command_id);
-	_mav_put_uint8_t(buf, 9, engine_cut_off);
-	_mav_put_uint8_t(buf, 10, extra_param);
-	_mav_put_float(buf, 11, extra_value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 15);
-#else
-	mavlink_digicam_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mode = mode;
-	packet.shutter_speed = shutter_speed;
-	packet.aperture = aperture;
-	packet.iso = iso;
-	packet.exposure_type = exposure_type;
-	packet.command_id = command_id;
-	packet.engine_cut_off = engine_cut_off;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 15);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIGICAM_CONFIGURE;
-	return mavlink_finalize_message(msg, system_id, component_id, 15);
-}
-
-/**
- * @brief Pack a digicam_configure message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param mode Mode enumeration from 1 to N //P, TV, AV, M, Etc (0 means ignore)
- * @param shutter_speed Divisor number //e.g. 1000 means 1/1000 (0 means ignore)
- * @param aperture F stop number x 10 //e.g. 28 means 2.8 (0 means ignore)
- * @param iso ISO enumeration from 1 to N //e.g. 80, 100, 200, Etc (0 means ignore)
- * @param exposure_type Exposure type enumeration from 1 to N (0 means ignore)
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param engine_cut_off Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_digicam_configure_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t mode,uint16_t shutter_speed,uint8_t aperture,uint8_t iso,uint8_t exposure_type,uint8_t command_id,uint8_t engine_cut_off,uint8_t extra_param,float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mode);
-	_mav_put_uint16_t(buf, 3, shutter_speed);
-	_mav_put_uint8_t(buf, 5, aperture);
-	_mav_put_uint8_t(buf, 6, iso);
-	_mav_put_uint8_t(buf, 7, exposure_type);
-	_mav_put_uint8_t(buf, 8, command_id);
-	_mav_put_uint8_t(buf, 9, engine_cut_off);
-	_mav_put_uint8_t(buf, 10, extra_param);
-	_mav_put_float(buf, 11, extra_value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 15);
-#else
-	mavlink_digicam_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mode = mode;
-	packet.shutter_speed = shutter_speed;
-	packet.aperture = aperture;
-	packet.iso = iso;
-	packet.exposure_type = exposure_type;
-	packet.command_id = command_id;
-	packet.engine_cut_off = engine_cut_off;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 15);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIGICAM_CONFIGURE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 15);
-}
-
-/**
- * @brief Encode a digicam_configure struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param digicam_configure C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_digicam_configure_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_digicam_configure_t* digicam_configure)
-{
-	return mavlink_msg_digicam_configure_pack(system_id, component_id, msg, digicam_configure->target_system, digicam_configure->target_component, digicam_configure->mode, digicam_configure->shutter_speed, digicam_configure->aperture, digicam_configure->iso, digicam_configure->exposure_type, digicam_configure->command_id, digicam_configure->engine_cut_off, digicam_configure->extra_param, digicam_configure->extra_value);
-}
-
-/**
- * @brief Send a digicam_configure message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mode Mode enumeration from 1 to N //P, TV, AV, M, Etc (0 means ignore)
- * @param shutter_speed Divisor number //e.g. 1000 means 1/1000 (0 means ignore)
- * @param aperture F stop number x 10 //e.g. 28 means 2.8 (0 means ignore)
- * @param iso ISO enumeration from 1 to N //e.g. 80, 100, 200, Etc (0 means ignore)
- * @param exposure_type Exposure type enumeration from 1 to N (0 means ignore)
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param engine_cut_off Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_digicam_configure_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t mode, uint16_t shutter_speed, uint8_t aperture, uint8_t iso, uint8_t exposure_type, uint8_t command_id, uint8_t engine_cut_off, uint8_t extra_param, float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mode);
-	_mav_put_uint16_t(buf, 3, shutter_speed);
-	_mav_put_uint8_t(buf, 5, aperture);
-	_mav_put_uint8_t(buf, 6, iso);
-	_mav_put_uint8_t(buf, 7, exposure_type);
-	_mav_put_uint8_t(buf, 8, command_id);
-	_mav_put_uint8_t(buf, 9, engine_cut_off);
-	_mav_put_uint8_t(buf, 10, extra_param);
-	_mav_put_float(buf, 11, extra_value);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIGICAM_CONFIGURE, buf, 15);
-#else
-	mavlink_digicam_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mode = mode;
-	packet.shutter_speed = shutter_speed;
-	packet.aperture = aperture;
-	packet.iso = iso;
-	packet.exposure_type = exposure_type;
-	packet.command_id = command_id;
-	packet.engine_cut_off = engine_cut_off;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIGICAM_CONFIGURE, (const char *)&packet, 15);
-#endif
-}
-
-#endif
-
-// MESSAGE DIGICAM_CONFIGURE UNPACKING
-
-
-/**
- * @brief Get field target_system from digicam_configure message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from digicam_configure message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field mode from digicam_configure message
- *
- * @return Mode enumeration from 1 to N //P, TV, AV, M, Etc (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field shutter_speed from digicam_configure message
- *
- * @return Divisor number //e.g. 1000 means 1/1000 (0 means ignore)
- */
-static inline uint16_t mavlink_msg_digicam_configure_get_shutter_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field aperture from digicam_configure message
- *
- * @return F stop number x 10 //e.g. 28 means 2.8 (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_aperture(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field iso from digicam_configure message
- *
- * @return ISO enumeration from 1 to N //e.g. 80, 100, 200, Etc (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_iso(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field exposure_type from digicam_configure message
- *
- * @return Exposure type enumeration from 1 to N (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_exposure_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Get field command_id from digicam_configure message
- *
- * @return Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_command_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field engine_cut_off from digicam_configure message
- *
- * @return Main engine cut-off time before camera trigger in seconds/10 (0 means no cut-off)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_engine_cut_off(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  9);
-}
-
-/**
- * @brief Get field extra_param from digicam_configure message
- *
- * @return Extra parameters enumeration (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_configure_get_extra_param(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  10);
-}
-
-/**
- * @brief Get field extra_value from digicam_configure message
- *
- * @return Correspondent value to given extra_param
- */
-static inline float mavlink_msg_digicam_configure_get_extra_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  11);
-}
-
-/**
- * @brief Decode a digicam_configure message into a struct
- *
- * @param msg The message to decode
- * @param digicam_configure C-struct to decode the message contents into
- */
-static inline void mavlink_msg_digicam_configure_decode(const mavlink_message_t* msg, mavlink_digicam_configure_t* digicam_configure)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	digicam_configure->target_system = mavlink_msg_digicam_configure_get_target_system(msg);
-	digicam_configure->target_component = mavlink_msg_digicam_configure_get_target_component(msg);
-	digicam_configure->mode = mavlink_msg_digicam_configure_get_mode(msg);
-	digicam_configure->shutter_speed = mavlink_msg_digicam_configure_get_shutter_speed(msg);
-	digicam_configure->aperture = mavlink_msg_digicam_configure_get_aperture(msg);
-	digicam_configure->iso = mavlink_msg_digicam_configure_get_iso(msg);
-	digicam_configure->exposure_type = mavlink_msg_digicam_configure_get_exposure_type(msg);
-	digicam_configure->command_id = mavlink_msg_digicam_configure_get_command_id(msg);
-	digicam_configure->engine_cut_off = mavlink_msg_digicam_configure_get_engine_cut_off(msg);
-	digicam_configure->extra_param = mavlink_msg_digicam_configure_get_extra_param(msg);
-	digicam_configure->extra_value = mavlink_msg_digicam_configure_get_extra_value(msg);
-#else
-	memcpy(digicam_configure, _MAV_PAYLOAD(msg), 15);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_control.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_control.h
deleted file mode 100644
index f0cc511de..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_control.h
+++ /dev/null
@@ -1,342 +0,0 @@
-// MESSAGE DIGICAM_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_DIGICAM_CONTROL 155
-
-typedef struct __mavlink_digicam_control_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t session; ///< 0: stop, 1: start or keep it up //Session control e.g. show/hide lens
- uint8_t zoom_pos; ///< 1 to N //Zoom's absolute position (0 means ignore)
- int8_t zoom_step; ///< -100 to 100 //Zooming step value to offset zoom from the current position
- uint8_t focus_lock; ///< 0: unlock focus or keep unlocked, 1: lock focus or keep locked, 3: re-lock focus
- uint8_t shot; ///< 0: ignore, 1: shot or start filming
- uint8_t command_id; ///< Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- uint8_t extra_param; ///< Extra parameters enumeration (0 means ignore)
- float extra_value; ///< Correspondent value to given extra_param
-} mavlink_digicam_control_t;
-
-#define MAVLINK_MSG_ID_DIGICAM_CONTROL_LEN 13
-#define MAVLINK_MSG_ID_155_LEN 13
-
-
-
-#define MAVLINK_MESSAGE_INFO_DIGICAM_CONTROL { \
-	"DIGICAM_CONTROL", \
-	10, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_digicam_control_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_digicam_control_t, target_component) }, \
-         { "session", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_digicam_control_t, session) }, \
-         { "zoom_pos", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_digicam_control_t, zoom_pos) }, \
-         { "zoom_step", NULL, MAVLINK_TYPE_INT8_T, 0, 4, offsetof(mavlink_digicam_control_t, zoom_step) }, \
-         { "focus_lock", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_digicam_control_t, focus_lock) }, \
-         { "shot", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_digicam_control_t, shot) }, \
-         { "command_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_digicam_control_t, command_id) }, \
-         { "extra_param", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_digicam_control_t, extra_param) }, \
-         { "extra_value", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_digicam_control_t, extra_value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a digicam_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param session 0: stop, 1: start or keep it up //Session control e.g. show/hide lens
- * @param zoom_pos 1 to N //Zoom's absolute position (0 means ignore)
- * @param zoom_step -100 to 100 //Zooming step value to offset zoom from the current position
- * @param focus_lock 0: unlock focus or keep unlocked, 1: lock focus or keep locked, 3: re-lock focus
- * @param shot 0: ignore, 1: shot or start filming
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_digicam_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t session, uint8_t zoom_pos, int8_t zoom_step, uint8_t focus_lock, uint8_t shot, uint8_t command_id, uint8_t extra_param, float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, session);
-	_mav_put_uint8_t(buf, 3, zoom_pos);
-	_mav_put_int8_t(buf, 4, zoom_step);
-	_mav_put_uint8_t(buf, 5, focus_lock);
-	_mav_put_uint8_t(buf, 6, shot);
-	_mav_put_uint8_t(buf, 7, command_id);
-	_mav_put_uint8_t(buf, 8, extra_param);
-	_mav_put_float(buf, 9, extra_value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_digicam_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.session = session;
-	packet.zoom_pos = zoom_pos;
-	packet.zoom_step = zoom_step;
-	packet.focus_lock = focus_lock;
-	packet.shot = shot;
-	packet.command_id = command_id;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIGICAM_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 13);
-}
-
-/**
- * @brief Pack a digicam_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param session 0: stop, 1: start or keep it up //Session control e.g. show/hide lens
- * @param zoom_pos 1 to N //Zoom's absolute position (0 means ignore)
- * @param zoom_step -100 to 100 //Zooming step value to offset zoom from the current position
- * @param focus_lock 0: unlock focus or keep unlocked, 1: lock focus or keep locked, 3: re-lock focus
- * @param shot 0: ignore, 1: shot or start filming
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_digicam_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t session,uint8_t zoom_pos,int8_t zoom_step,uint8_t focus_lock,uint8_t shot,uint8_t command_id,uint8_t extra_param,float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, session);
-	_mav_put_uint8_t(buf, 3, zoom_pos);
-	_mav_put_int8_t(buf, 4, zoom_step);
-	_mav_put_uint8_t(buf, 5, focus_lock);
-	_mav_put_uint8_t(buf, 6, shot);
-	_mav_put_uint8_t(buf, 7, command_id);
-	_mav_put_uint8_t(buf, 8, extra_param);
-	_mav_put_float(buf, 9, extra_value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_digicam_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.session = session;
-	packet.zoom_pos = zoom_pos;
-	packet.zoom_step = zoom_step;
-	packet.focus_lock = focus_lock;
-	packet.shot = shot;
-	packet.command_id = command_id;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIGICAM_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 13);
-}
-
-/**
- * @brief Encode a digicam_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param digicam_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_digicam_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_digicam_control_t* digicam_control)
-{
-	return mavlink_msg_digicam_control_pack(system_id, component_id, msg, digicam_control->target_system, digicam_control->target_component, digicam_control->session, digicam_control->zoom_pos, digicam_control->zoom_step, digicam_control->focus_lock, digicam_control->shot, digicam_control->command_id, digicam_control->extra_param, digicam_control->extra_value);
-}
-
-/**
- * @brief Send a digicam_control message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param session 0: stop, 1: start or keep it up //Session control e.g. show/hide lens
- * @param zoom_pos 1 to N //Zoom's absolute position (0 means ignore)
- * @param zoom_step -100 to 100 //Zooming step value to offset zoom from the current position
- * @param focus_lock 0: unlock focus or keep unlocked, 1: lock focus or keep locked, 3: re-lock focus
- * @param shot 0: ignore, 1: shot or start filming
- * @param command_id Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- * @param extra_param Extra parameters enumeration (0 means ignore)
- * @param extra_value Correspondent value to given extra_param
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_digicam_control_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t session, uint8_t zoom_pos, int8_t zoom_step, uint8_t focus_lock, uint8_t shot, uint8_t command_id, uint8_t extra_param, float extra_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, session);
-	_mav_put_uint8_t(buf, 3, zoom_pos);
-	_mav_put_int8_t(buf, 4, zoom_step);
-	_mav_put_uint8_t(buf, 5, focus_lock);
-	_mav_put_uint8_t(buf, 6, shot);
-	_mav_put_uint8_t(buf, 7, command_id);
-	_mav_put_uint8_t(buf, 8, extra_param);
-	_mav_put_float(buf, 9, extra_value);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIGICAM_CONTROL, buf, 13);
-#else
-	mavlink_digicam_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.session = session;
-	packet.zoom_pos = zoom_pos;
-	packet.zoom_step = zoom_step;
-	packet.focus_lock = focus_lock;
-	packet.shot = shot;
-	packet.command_id = command_id;
-	packet.extra_param = extra_param;
-	packet.extra_value = extra_value;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIGICAM_CONTROL, (const char *)&packet, 13);
-#endif
-}
-
-#endif
-
-// MESSAGE DIGICAM_CONTROL UNPACKING
-
-
-/**
- * @brief Get field target_system from digicam_control message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_digicam_control_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from digicam_control message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_digicam_control_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field session from digicam_control message
- *
- * @return 0: stop, 1: start or keep it up //Session control e.g. show/hide lens
- */
-static inline uint8_t mavlink_msg_digicam_control_get_session(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field zoom_pos from digicam_control message
- *
- * @return 1 to N //Zoom's absolute position (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_control_get_zoom_pos(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field zoom_step from digicam_control message
- *
- * @return -100 to 100 //Zooming step value to offset zoom from the current position
- */
-static inline int8_t mavlink_msg_digicam_control_get_zoom_step(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int8_t(msg,  4);
-}
-
-/**
- * @brief Get field focus_lock from digicam_control message
- *
- * @return 0: unlock focus or keep unlocked, 1: lock focus or keep locked, 3: re-lock focus
- */
-static inline uint8_t mavlink_msg_digicam_control_get_focus_lock(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field shot from digicam_control message
- *
- * @return 0: ignore, 1: shot or start filming
- */
-static inline uint8_t mavlink_msg_digicam_control_get_shot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field command_id from digicam_control message
- *
- * @return Command Identity (incremental loop: 0 to 255)//A command sent multiple times will be executed or pooled just once
- */
-static inline uint8_t mavlink_msg_digicam_control_get_command_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Get field extra_param from digicam_control message
- *
- * @return Extra parameters enumeration (0 means ignore)
- */
-static inline uint8_t mavlink_msg_digicam_control_get_extra_param(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field extra_value from digicam_control message
- *
- * @return Correspondent value to given extra_param
- */
-static inline float mavlink_msg_digicam_control_get_extra_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Decode a digicam_control message into a struct
- *
- * @param msg The message to decode
- * @param digicam_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_digicam_control_decode(const mavlink_message_t* msg, mavlink_digicam_control_t* digicam_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	digicam_control->target_system = mavlink_msg_digicam_control_get_target_system(msg);
-	digicam_control->target_component = mavlink_msg_digicam_control_get_target_component(msg);
-	digicam_control->session = mavlink_msg_digicam_control_get_session(msg);
-	digicam_control->zoom_pos = mavlink_msg_digicam_control_get_zoom_pos(msg);
-	digicam_control->zoom_step = mavlink_msg_digicam_control_get_zoom_step(msg);
-	digicam_control->focus_lock = mavlink_msg_digicam_control_get_focus_lock(msg);
-	digicam_control->shot = mavlink_msg_digicam_control_get_shot(msg);
-	digicam_control->command_id = mavlink_msg_digicam_control_get_command_id(msg);
-	digicam_control->extra_param = mavlink_msg_digicam_control_get_extra_param(msg);
-	digicam_control->extra_value = mavlink_msg_digicam_control_get_extra_value(msg);
-#else
-	memcpy(digicam_control, _MAV_PAYLOAD(msg), 13);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_fetch_point.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_fetch_point.h
deleted file mode 100644
index 112b1ecf0..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_fetch_point.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE FENCE_FETCH_POINT PACKING
-
-#define MAVLINK_MSG_ID_FENCE_FETCH_POINT 161
-
-typedef struct __mavlink_fence_fetch_point_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t idx; ///< point index (first point is 1, 0 is for return point)
-} mavlink_fence_fetch_point_t;
-
-#define MAVLINK_MSG_ID_FENCE_FETCH_POINT_LEN 3
-#define MAVLINK_MSG_ID_161_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_FENCE_FETCH_POINT { \
-	"FENCE_FETCH_POINT", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_fence_fetch_point_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_fence_fetch_point_t, target_component) }, \
-         { "idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_fence_fetch_point_t, idx) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a fence_fetch_point message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_fetch_point_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_fence_fetch_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_FETCH_POINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a fence_fetch_point message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_fetch_point_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_fence_fetch_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_FETCH_POINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a fence_fetch_point struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param fence_fetch_point C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_fence_fetch_point_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_fence_fetch_point_t* fence_fetch_point)
-{
-	return mavlink_msg_fence_fetch_point_pack(system_id, component_id, msg, fence_fetch_point->target_system, fence_fetch_point->target_component, fence_fetch_point->idx);
-}
-
-/**
- * @brief Send a fence_fetch_point message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_fence_fetch_point_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_FETCH_POINT, buf, 3);
-#else
-	mavlink_fence_fetch_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_FETCH_POINT, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE FENCE_FETCH_POINT UNPACKING
-
-
-/**
- * @brief Get field target_system from fence_fetch_point message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_fence_fetch_point_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from fence_fetch_point message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_fence_fetch_point_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field idx from fence_fetch_point message
- *
- * @return point index (first point is 1, 0 is for return point)
- */
-static inline uint8_t mavlink_msg_fence_fetch_point_get_idx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a fence_fetch_point message into a struct
- *
- * @param msg The message to decode
- * @param fence_fetch_point C-struct to decode the message contents into
- */
-static inline void mavlink_msg_fence_fetch_point_decode(const mavlink_message_t* msg, mavlink_fence_fetch_point_t* fence_fetch_point)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	fence_fetch_point->target_system = mavlink_msg_fence_fetch_point_get_target_system(msg);
-	fence_fetch_point->target_component = mavlink_msg_fence_fetch_point_get_target_component(msg);
-	fence_fetch_point->idx = mavlink_msg_fence_fetch_point_get_idx(msg);
-#else
-	memcpy(fence_fetch_point, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_point.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_point.h
deleted file mode 100644
index b46b259f4..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_point.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE FENCE_POINT PACKING
-
-#define MAVLINK_MSG_ID_FENCE_POINT 160
-
-typedef struct __mavlink_fence_point_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t idx; ///< point index (first point is 1, 0 is for return point)
- uint8_t count; ///< total number of points (for sanity checking)
- float lat; ///< Latitude of point
- float lng; ///< Longitude of point
-} mavlink_fence_point_t;
-
-#define MAVLINK_MSG_ID_FENCE_POINT_LEN 12
-#define MAVLINK_MSG_ID_160_LEN 12
-
-
-
-#define MAVLINK_MESSAGE_INFO_FENCE_POINT { \
-	"FENCE_POINT", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_fence_point_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_fence_point_t, target_component) }, \
-         { "idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_fence_point_t, idx) }, \
-         { "count", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_fence_point_t, count) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_fence_point_t, lat) }, \
-         { "lng", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_fence_point_t, lng) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a fence_point message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_point_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t idx, uint8_t count, float lat, float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-	_mav_put_uint8_t(buf, 3, count);
-	_mav_put_float(buf, 4, lat);
-	_mav_put_float(buf, 8, lng);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_fence_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-	packet.count = count;
-	packet.lat = lat;
-	packet.lng = lng;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_POINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 12);
-}
-
-/**
- * @brief Pack a fence_point message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_point_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t idx,uint8_t count,float lat,float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-	_mav_put_uint8_t(buf, 3, count);
-	_mav_put_float(buf, 4, lat);
-	_mav_put_float(buf, 8, lng);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_fence_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-	packet.count = count;
-	packet.lat = lat;
-	packet.lng = lng;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_POINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12);
-}
-
-/**
- * @brief Encode a fence_point struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param fence_point C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_fence_point_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_fence_point_t* fence_point)
-{
-	return mavlink_msg_fence_point_pack(system_id, component_id, msg, fence_point->target_system, fence_point->target_component, fence_point->idx, fence_point->count, fence_point->lat, fence_point->lng);
-}
-
-/**
- * @brief Send a fence_point message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_fence_point_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t idx, uint8_t count, float lat, float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, idx);
-	_mav_put_uint8_t(buf, 3, count);
-	_mav_put_float(buf, 4, lat);
-	_mav_put_float(buf, 8, lng);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_POINT, buf, 12);
-#else
-	mavlink_fence_point_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.idx = idx;
-	packet.count = count;
-	packet.lat = lat;
-	packet.lng = lng;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_POINT, (const char *)&packet, 12);
-#endif
-}
-
-#endif
-
-// MESSAGE FENCE_POINT UNPACKING
-
-
-/**
- * @brief Get field target_system from fence_point message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_fence_point_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from fence_point message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_fence_point_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field idx from fence_point message
- *
- * @return point index (first point is 1, 0 is for return point)
- */
-static inline uint8_t mavlink_msg_fence_point_get_idx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field count from fence_point message
- *
- * @return total number of points (for sanity checking)
- */
-static inline uint8_t mavlink_msg_fence_point_get_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field lat from fence_point message
- *
- * @return Latitude of point
- */
-static inline float mavlink_msg_fence_point_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field lng from fence_point message
- *
- * @return Longitude of point
- */
-static inline float mavlink_msg_fence_point_get_lng(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Decode a fence_point message into a struct
- *
- * @param msg The message to decode
- * @param fence_point C-struct to decode the message contents into
- */
-static inline void mavlink_msg_fence_point_decode(const mavlink_message_t* msg, mavlink_fence_point_t* fence_point)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	fence_point->target_system = mavlink_msg_fence_point_get_target_system(msg);
-	fence_point->target_component = mavlink_msg_fence_point_get_target_component(msg);
-	fence_point->idx = mavlink_msg_fence_point_get_idx(msg);
-	fence_point->count = mavlink_msg_fence_point_get_count(msg);
-	fence_point->lat = mavlink_msg_fence_point_get_lat(msg);
-	fence_point->lng = mavlink_msg_fence_point_get_lng(msg);
-#else
-	memcpy(fence_point, _MAV_PAYLOAD(msg), 12);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_status.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_status.h
deleted file mode 100644
index 77b3e5631..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_status.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE FENCE_STATUS PACKING
-
-#define MAVLINK_MSG_ID_FENCE_STATUS 162
-
-typedef struct __mavlink_fence_status_t
-{
- uint8_t breach_status; ///< 0 if currently inside fence, 1 if outside
- uint16_t breach_count; ///< number of fence breaches
- uint8_t breach_type; ///< last breach type (see FENCE_BREACH_* enum)
- uint32_t breach_time; ///< time of last breach in milliseconds since boot
-} mavlink_fence_status_t;
-
-#define MAVLINK_MSG_ID_FENCE_STATUS_LEN 8
-#define MAVLINK_MSG_ID_162_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_FENCE_STATUS { \
-	"FENCE_STATUS", \
-	4, \
-	{  { "breach_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_fence_status_t, breach_status) }, \
-         { "breach_count", NULL, MAVLINK_TYPE_UINT16_T, 0, 1, offsetof(mavlink_fence_status_t, breach_count) }, \
-         { "breach_type", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_fence_status_t, breach_type) }, \
-         { "breach_time", NULL, MAVLINK_TYPE_UINT32_T, 0, 4, offsetof(mavlink_fence_status_t, breach_time) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a fence_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param breach_status 0 if currently inside fence, 1 if outside
- * @param breach_count number of fence breaches
- * @param breach_type last breach type (see FENCE_BREACH_* enum)
- * @param breach_time time of last breach in milliseconds since boot
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t breach_status, uint16_t breach_count, uint8_t breach_type, uint32_t breach_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, breach_status);
-	_mav_put_uint16_t(buf, 1, breach_count);
-	_mav_put_uint8_t(buf, 3, breach_type);
-	_mav_put_uint32_t(buf, 4, breach_time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_fence_status_t packet;
-	packet.breach_status = breach_status;
-	packet.breach_count = breach_count;
-	packet.breach_type = breach_type;
-	packet.breach_time = breach_time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a fence_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param breach_status 0 if currently inside fence, 1 if outside
- * @param breach_count number of fence breaches
- * @param breach_type last breach type (see FENCE_BREACH_* enum)
- * @param breach_time time of last breach in milliseconds since boot
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fence_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t breach_status,uint16_t breach_count,uint8_t breach_type,uint32_t breach_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, breach_status);
-	_mav_put_uint16_t(buf, 1, breach_count);
-	_mav_put_uint8_t(buf, 3, breach_type);
-	_mav_put_uint32_t(buf, 4, breach_time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_fence_status_t packet;
-	packet.breach_status = breach_status;
-	packet.breach_count = breach_count;
-	packet.breach_type = breach_type;
-	packet.breach_time = breach_time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCE_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a fence_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param fence_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_fence_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_fence_status_t* fence_status)
-{
-	return mavlink_msg_fence_status_pack(system_id, component_id, msg, fence_status->breach_status, fence_status->breach_count, fence_status->breach_type, fence_status->breach_time);
-}
-
-/**
- * @brief Send a fence_status message
- * @param chan MAVLink channel to send the message
- *
- * @param breach_status 0 if currently inside fence, 1 if outside
- * @param breach_count number of fence breaches
- * @param breach_type last breach type (see FENCE_BREACH_* enum)
- * @param breach_time time of last breach in milliseconds since boot
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_fence_status_send(mavlink_channel_t chan, uint8_t breach_status, uint16_t breach_count, uint8_t breach_type, uint32_t breach_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, breach_status);
-	_mav_put_uint16_t(buf, 1, breach_count);
-	_mav_put_uint8_t(buf, 3, breach_type);
-	_mav_put_uint32_t(buf, 4, breach_time);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_STATUS, buf, 8);
-#else
-	mavlink_fence_status_t packet;
-	packet.breach_status = breach_status;
-	packet.breach_count = breach_count;
-	packet.breach_type = breach_type;
-	packet.breach_time = breach_time;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCE_STATUS, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE FENCE_STATUS UNPACKING
-
-
-/**
- * @brief Get field breach_status from fence_status message
- *
- * @return 0 if currently inside fence, 1 if outside
- */
-static inline uint8_t mavlink_msg_fence_status_get_breach_status(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field breach_count from fence_status message
- *
- * @return number of fence breaches
- */
-static inline uint16_t mavlink_msg_fence_status_get_breach_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  1);
-}
-
-/**
- * @brief Get field breach_type from fence_status message
- *
- * @return last breach type (see FENCE_BREACH_* enum)
- */
-static inline uint8_t mavlink_msg_fence_status_get_breach_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field breach_time from fence_status message
- *
- * @return time of last breach in milliseconds since boot
- */
-static inline uint32_t mavlink_msg_fence_status_get_breach_time(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  4);
-}
-
-/**
- * @brief Decode a fence_status message into a struct
- *
- * @param msg The message to decode
- * @param fence_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_fence_status_decode(const mavlink_message_t* msg, mavlink_fence_status_t* fence_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	fence_status->breach_status = mavlink_msg_fence_status_get_breach_status(msg);
-	fence_status->breach_count = mavlink_msg_fence_status_get_breach_count(msg);
-	fence_status->breach_type = mavlink_msg_fence_status_get_breach_type(msg);
-	fence_status->breach_time = mavlink_msg_fence_status_get_breach_time(msg);
-#else
-	memcpy(fence_status, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_hwstatus.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_hwstatus.h
deleted file mode 100644
index 47cc21484..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_hwstatus.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE HWSTATUS PACKING
-
-#define MAVLINK_MSG_ID_HWSTATUS 165
-
-typedef struct __mavlink_hwstatus_t
-{
- uint16_t Vcc; ///< board voltage (mV)
- uint8_t I2Cerr; ///< I2C error count
-} mavlink_hwstatus_t;
-
-#define MAVLINK_MSG_ID_HWSTATUS_LEN 3
-#define MAVLINK_MSG_ID_165_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_HWSTATUS { \
-	"HWSTATUS", \
-	2, \
-	{  { "Vcc", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_hwstatus_t, Vcc) }, \
-         { "I2Cerr", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_hwstatus_t, I2Cerr) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a hwstatus message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param Vcc board voltage (mV)
- * @param I2Cerr I2C error count
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hwstatus_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t Vcc, uint8_t I2Cerr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, Vcc);
-	_mav_put_uint8_t(buf, 2, I2Cerr);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_hwstatus_t packet;
-	packet.Vcc = Vcc;
-	packet.I2Cerr = I2Cerr;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HWSTATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a hwstatus message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param Vcc board voltage (mV)
- * @param I2Cerr I2C error count
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hwstatus_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t Vcc,uint8_t I2Cerr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, Vcc);
-	_mav_put_uint8_t(buf, 2, I2Cerr);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_hwstatus_t packet;
-	packet.Vcc = Vcc;
-	packet.I2Cerr = I2Cerr;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HWSTATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a hwstatus struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param hwstatus C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_hwstatus_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_hwstatus_t* hwstatus)
-{
-	return mavlink_msg_hwstatus_pack(system_id, component_id, msg, hwstatus->Vcc, hwstatus->I2Cerr);
-}
-
-/**
- * @brief Send a hwstatus message
- * @param chan MAVLink channel to send the message
- *
- * @param Vcc board voltage (mV)
- * @param I2Cerr I2C error count
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_hwstatus_send(mavlink_channel_t chan, uint16_t Vcc, uint8_t I2Cerr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, Vcc);
-	_mav_put_uint8_t(buf, 2, I2Cerr);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HWSTATUS, buf, 3);
-#else
-	mavlink_hwstatus_t packet;
-	packet.Vcc = Vcc;
-	packet.I2Cerr = I2Cerr;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HWSTATUS, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE HWSTATUS UNPACKING
-
-
-/**
- * @brief Get field Vcc from hwstatus message
- *
- * @return board voltage (mV)
- */
-static inline uint16_t mavlink_msg_hwstatus_get_Vcc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field I2Cerr from hwstatus message
- *
- * @return I2C error count
- */
-static inline uint8_t mavlink_msg_hwstatus_get_I2Cerr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a hwstatus message into a struct
- *
- * @param msg The message to decode
- * @param hwstatus C-struct to decode the message contents into
- */
-static inline void mavlink_msg_hwstatus_decode(const mavlink_message_t* msg, mavlink_hwstatus_t* hwstatus)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	hwstatus->Vcc = mavlink_msg_hwstatus_get_Vcc(msg);
-	hwstatus->I2Cerr = mavlink_msg_hwstatus_get_I2Cerr(msg);
-#else
-	memcpy(hwstatus, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_meminfo.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_meminfo.h
deleted file mode 100644
index e9efa5da2..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_meminfo.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE MEMINFO PACKING
-
-#define MAVLINK_MSG_ID_MEMINFO 152
-
-typedef struct __mavlink_meminfo_t
-{
- uint16_t brkval; ///< heap top
- uint16_t freemem; ///< free memory
-} mavlink_meminfo_t;
-
-#define MAVLINK_MSG_ID_MEMINFO_LEN 4
-#define MAVLINK_MSG_ID_152_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_MEMINFO { \
-	"MEMINFO", \
-	2, \
-	{  { "brkval", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_meminfo_t, brkval) }, \
-         { "freemem", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_meminfo_t, freemem) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a meminfo message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param brkval heap top
- * @param freemem free memory
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_meminfo_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t brkval, uint16_t freemem)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, brkval);
-	_mav_put_uint16_t(buf, 2, freemem);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_meminfo_t packet;
-	packet.brkval = brkval;
-	packet.freemem = freemem;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MEMINFO;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a meminfo message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param brkval heap top
- * @param freemem free memory
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_meminfo_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t brkval,uint16_t freemem)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, brkval);
-	_mav_put_uint16_t(buf, 2, freemem);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_meminfo_t packet;
-	packet.brkval = brkval;
-	packet.freemem = freemem;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MEMINFO;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a meminfo struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param meminfo C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_meminfo_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_meminfo_t* meminfo)
-{
-	return mavlink_msg_meminfo_pack(system_id, component_id, msg, meminfo->brkval, meminfo->freemem);
-}
-
-/**
- * @brief Send a meminfo message
- * @param chan MAVLink channel to send the message
- *
- * @param brkval heap top
- * @param freemem free memory
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_meminfo_send(mavlink_channel_t chan, uint16_t brkval, uint16_t freemem)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, brkval);
-	_mav_put_uint16_t(buf, 2, freemem);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MEMINFO, buf, 4);
-#else
-	mavlink_meminfo_t packet;
-	packet.brkval = brkval;
-	packet.freemem = freemem;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MEMINFO, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE MEMINFO UNPACKING
-
-
-/**
- * @brief Get field brkval from meminfo message
- *
- * @return heap top
- */
-static inline uint16_t mavlink_msg_meminfo_get_brkval(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field freemem from meminfo message
- *
- * @return free memory
- */
-static inline uint16_t mavlink_msg_meminfo_get_freemem(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a meminfo message into a struct
- *
- * @param msg The message to decode
- * @param meminfo C-struct to decode the message contents into
- */
-static inline void mavlink_msg_meminfo_decode(const mavlink_message_t* msg, mavlink_meminfo_t* meminfo)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	meminfo->brkval = mavlink_msg_meminfo_get_brkval(msg);
-	meminfo->freemem = mavlink_msg_meminfo_get_freemem(msg);
-#else
-	memcpy(meminfo, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_configure.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_configure.h
deleted file mode 100644
index 688d89415..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_configure.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE MOUNT_CONFIGURE PACKING
-
-#define MAVLINK_MSG_ID_MOUNT_CONFIGURE 156
-
-typedef struct __mavlink_mount_configure_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t mount_mode; ///< mount operating mode (see MAV_MOUNT_MODE enum)
- uint8_t stab_roll; ///< (1 = yes, 0 = no)
- uint8_t stab_pitch; ///< (1 = yes, 0 = no)
- uint8_t stab_yaw; ///< (1 = yes, 0 = no)
-} mavlink_mount_configure_t;
-
-#define MAVLINK_MSG_ID_MOUNT_CONFIGURE_LEN 6
-#define MAVLINK_MSG_ID_156_LEN 6
-
-
-
-#define MAVLINK_MESSAGE_INFO_MOUNT_CONFIGURE { \
-	"MOUNT_CONFIGURE", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_mount_configure_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_mount_configure_t, target_component) }, \
-         { "mount_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_mount_configure_t, mount_mode) }, \
-         { "stab_roll", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_mount_configure_t, stab_roll) }, \
-         { "stab_pitch", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_mount_configure_t, stab_pitch) }, \
-         { "stab_yaw", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_mount_configure_t, stab_yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a mount_configure message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mount_mode mount operating mode (see MAV_MOUNT_MODE enum)
- * @param stab_roll (1 = yes, 0 = no)
- * @param stab_pitch (1 = yes, 0 = no)
- * @param stab_yaw (1 = yes, 0 = no)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_configure_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t mount_mode, uint8_t stab_roll, uint8_t stab_pitch, uint8_t stab_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mount_mode);
-	_mav_put_uint8_t(buf, 3, stab_roll);
-	_mav_put_uint8_t(buf, 4, stab_pitch);
-	_mav_put_uint8_t(buf, 5, stab_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_mount_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mount_mode = mount_mode;
-	packet.stab_roll = stab_roll;
-	packet.stab_pitch = stab_pitch;
-	packet.stab_yaw = stab_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_CONFIGURE;
-	return mavlink_finalize_message(msg, system_id, component_id, 6);
-}
-
-/**
- * @brief Pack a mount_configure message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param mount_mode mount operating mode (see MAV_MOUNT_MODE enum)
- * @param stab_roll (1 = yes, 0 = no)
- * @param stab_pitch (1 = yes, 0 = no)
- * @param stab_yaw (1 = yes, 0 = no)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_configure_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t mount_mode,uint8_t stab_roll,uint8_t stab_pitch,uint8_t stab_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mount_mode);
-	_mav_put_uint8_t(buf, 3, stab_roll);
-	_mav_put_uint8_t(buf, 4, stab_pitch);
-	_mav_put_uint8_t(buf, 5, stab_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_mount_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mount_mode = mount_mode;
-	packet.stab_roll = stab_roll;
-	packet.stab_pitch = stab_pitch;
-	packet.stab_yaw = stab_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_CONFIGURE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 6);
-}
-
-/**
- * @brief Encode a mount_configure struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param mount_configure C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_mount_configure_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_mount_configure_t* mount_configure)
-{
-	return mavlink_msg_mount_configure_pack(system_id, component_id, msg, mount_configure->target_system, mount_configure->target_component, mount_configure->mount_mode, mount_configure->stab_roll, mount_configure->stab_pitch, mount_configure->stab_yaw);
-}
-
-/**
- * @brief Send a mount_configure message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mount_mode mount operating mode (see MAV_MOUNT_MODE enum)
- * @param stab_roll (1 = yes, 0 = no)
- * @param stab_pitch (1 = yes, 0 = no)
- * @param stab_yaw (1 = yes, 0 = no)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_mount_configure_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t mount_mode, uint8_t stab_roll, uint8_t stab_pitch, uint8_t stab_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, mount_mode);
-	_mav_put_uint8_t(buf, 3, stab_roll);
-	_mav_put_uint8_t(buf, 4, stab_pitch);
-	_mav_put_uint8_t(buf, 5, stab_yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_CONFIGURE, buf, 6);
-#else
-	mavlink_mount_configure_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mount_mode = mount_mode;
-	packet.stab_roll = stab_roll;
-	packet.stab_pitch = stab_pitch;
-	packet.stab_yaw = stab_yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_CONFIGURE, (const char *)&packet, 6);
-#endif
-}
-
-#endif
-
-// MESSAGE MOUNT_CONFIGURE UNPACKING
-
-
-/**
- * @brief Get field target_system from mount_configure message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_mount_configure_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from mount_configure message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_mount_configure_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field mount_mode from mount_configure message
- *
- * @return mount operating mode (see MAV_MOUNT_MODE enum)
- */
-static inline uint8_t mavlink_msg_mount_configure_get_mount_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field stab_roll from mount_configure message
- *
- * @return (1 = yes, 0 = no)
- */
-static inline uint8_t mavlink_msg_mount_configure_get_stab_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field stab_pitch from mount_configure message
- *
- * @return (1 = yes, 0 = no)
- */
-static inline uint8_t mavlink_msg_mount_configure_get_stab_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field stab_yaw from mount_configure message
- *
- * @return (1 = yes, 0 = no)
- */
-static inline uint8_t mavlink_msg_mount_configure_get_stab_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Decode a mount_configure message into a struct
- *
- * @param msg The message to decode
- * @param mount_configure C-struct to decode the message contents into
- */
-static inline void mavlink_msg_mount_configure_decode(const mavlink_message_t* msg, mavlink_mount_configure_t* mount_configure)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mount_configure->target_system = mavlink_msg_mount_configure_get_target_system(msg);
-	mount_configure->target_component = mavlink_msg_mount_configure_get_target_component(msg);
-	mount_configure->mount_mode = mavlink_msg_mount_configure_get_mount_mode(msg);
-	mount_configure->stab_roll = mavlink_msg_mount_configure_get_stab_roll(msg);
-	mount_configure->stab_pitch = mavlink_msg_mount_configure_get_stab_pitch(msg);
-	mount_configure->stab_yaw = mavlink_msg_mount_configure_get_stab_yaw(msg);
-#else
-	memcpy(mount_configure, _MAV_PAYLOAD(msg), 6);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_control.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_control.h
deleted file mode 100644
index f13bea2d9..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_control.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE MOUNT_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_MOUNT_CONTROL 157
-
-typedef struct __mavlink_mount_control_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int32_t input_a; ///< pitch(deg*100) or lat, depending on mount mode
- int32_t input_b; ///< roll(deg*100) or lon depending on mount mode
- int32_t input_c; ///< yaw(deg*100) or alt (in cm) depending on mount mode
- uint8_t save_position; ///< if "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING)
-} mavlink_mount_control_t;
-
-#define MAVLINK_MSG_ID_MOUNT_CONTROL_LEN 15
-#define MAVLINK_MSG_ID_157_LEN 15
-
-
-
-#define MAVLINK_MESSAGE_INFO_MOUNT_CONTROL { \
-	"MOUNT_CONTROL", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_mount_control_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_mount_control_t, target_component) }, \
-         { "input_a", NULL, MAVLINK_TYPE_INT32_T, 0, 2, offsetof(mavlink_mount_control_t, input_a) }, \
-         { "input_b", NULL, MAVLINK_TYPE_INT32_T, 0, 6, offsetof(mavlink_mount_control_t, input_b) }, \
-         { "input_c", NULL, MAVLINK_TYPE_INT32_T, 0, 10, offsetof(mavlink_mount_control_t, input_c) }, \
-         { "save_position", NULL, MAVLINK_TYPE_UINT8_T, 0, 14, offsetof(mavlink_mount_control_t, save_position) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a mount_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param input_a pitch(deg*100) or lat, depending on mount mode
- * @param input_b roll(deg*100) or lon depending on mount mode
- * @param input_c yaw(deg*100) or alt (in cm) depending on mount mode
- * @param save_position if "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, int32_t input_a, int32_t input_b, int32_t input_c, uint8_t save_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, input_a);
-	_mav_put_int32_t(buf, 6, input_b);
-	_mav_put_int32_t(buf, 10, input_c);
-	_mav_put_uint8_t(buf, 14, save_position);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 15);
-#else
-	mavlink_mount_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.input_a = input_a;
-	packet.input_b = input_b;
-	packet.input_c = input_c;
-	packet.save_position = save_position;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 15);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 15);
-}
-
-/**
- * @brief Pack a mount_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param input_a pitch(deg*100) or lat, depending on mount mode
- * @param input_b roll(deg*100) or lon depending on mount mode
- * @param input_c yaw(deg*100) or alt (in cm) depending on mount mode
- * @param save_position if "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,int32_t input_a,int32_t input_b,int32_t input_c,uint8_t save_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, input_a);
-	_mav_put_int32_t(buf, 6, input_b);
-	_mav_put_int32_t(buf, 10, input_c);
-	_mav_put_uint8_t(buf, 14, save_position);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 15);
-#else
-	mavlink_mount_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.input_a = input_a;
-	packet.input_b = input_b;
-	packet.input_c = input_c;
-	packet.save_position = save_position;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 15);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 15);
-}
-
-/**
- * @brief Encode a mount_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param mount_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_mount_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_mount_control_t* mount_control)
-{
-	return mavlink_msg_mount_control_pack(system_id, component_id, msg, mount_control->target_system, mount_control->target_component, mount_control->input_a, mount_control->input_b, mount_control->input_c, mount_control->save_position);
-}
-
-/**
- * @brief Send a mount_control message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param input_a pitch(deg*100) or lat, depending on mount mode
- * @param input_b roll(deg*100) or lon depending on mount mode
- * @param input_c yaw(deg*100) or alt (in cm) depending on mount mode
- * @param save_position if "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_mount_control_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, int32_t input_a, int32_t input_b, int32_t input_c, uint8_t save_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[15];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, input_a);
-	_mav_put_int32_t(buf, 6, input_b);
-	_mav_put_int32_t(buf, 10, input_c);
-	_mav_put_uint8_t(buf, 14, save_position);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_CONTROL, buf, 15);
-#else
-	mavlink_mount_control_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.input_a = input_a;
-	packet.input_b = input_b;
-	packet.input_c = input_c;
-	packet.save_position = save_position;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_CONTROL, (const char *)&packet, 15);
-#endif
-}
-
-#endif
-
-// MESSAGE MOUNT_CONTROL UNPACKING
-
-
-/**
- * @brief Get field target_system from mount_control message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_mount_control_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from mount_control message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_mount_control_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field input_a from mount_control message
- *
- * @return pitch(deg*100) or lat, depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_control_get_input_a(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  2);
-}
-
-/**
- * @brief Get field input_b from mount_control message
- *
- * @return roll(deg*100) or lon depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_control_get_input_b(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  6);
-}
-
-/**
- * @brief Get field input_c from mount_control message
- *
- * @return yaw(deg*100) or alt (in cm) depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_control_get_input_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  10);
-}
-
-/**
- * @brief Get field save_position from mount_control message
- *
- * @return if "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING)
- */
-static inline uint8_t mavlink_msg_mount_control_get_save_position(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  14);
-}
-
-/**
- * @brief Decode a mount_control message into a struct
- *
- * @param msg The message to decode
- * @param mount_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_mount_control_decode(const mavlink_message_t* msg, mavlink_mount_control_t* mount_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mount_control->target_system = mavlink_msg_mount_control_get_target_system(msg);
-	mount_control->target_component = mavlink_msg_mount_control_get_target_component(msg);
-	mount_control->input_a = mavlink_msg_mount_control_get_input_a(msg);
-	mount_control->input_b = mavlink_msg_mount_control_get_input_b(msg);
-	mount_control->input_c = mavlink_msg_mount_control_get_input_c(msg);
-	mount_control->save_position = mavlink_msg_mount_control_get_save_position(msg);
-#else
-	memcpy(mount_control, _MAV_PAYLOAD(msg), 15);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_status.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_status.h
deleted file mode 100644
index 75a44321e..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_status.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE MOUNT_STATUS PACKING
-
-#define MAVLINK_MSG_ID_MOUNT_STATUS 158
-
-typedef struct __mavlink_mount_status_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int32_t pointing_a; ///< pitch(deg*100) or lat, depending on mount mode
- int32_t pointing_b; ///< roll(deg*100) or lon depending on mount mode
- int32_t pointing_c; ///< yaw(deg*100) or alt (in cm) depending on mount mode
-} mavlink_mount_status_t;
-
-#define MAVLINK_MSG_ID_MOUNT_STATUS_LEN 14
-#define MAVLINK_MSG_ID_158_LEN 14
-
-
-
-#define MAVLINK_MESSAGE_INFO_MOUNT_STATUS { \
-	"MOUNT_STATUS", \
-	5, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_mount_status_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_mount_status_t, target_component) }, \
-         { "pointing_a", NULL, MAVLINK_TYPE_INT32_T, 0, 2, offsetof(mavlink_mount_status_t, pointing_a) }, \
-         { "pointing_b", NULL, MAVLINK_TYPE_INT32_T, 0, 6, offsetof(mavlink_mount_status_t, pointing_b) }, \
-         { "pointing_c", NULL, MAVLINK_TYPE_INT32_T, 0, 10, offsetof(mavlink_mount_status_t, pointing_c) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a mount_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param pointing_a pitch(deg*100) or lat, depending on mount mode
- * @param pointing_b roll(deg*100) or lon depending on mount mode
- * @param pointing_c yaw(deg*100) or alt (in cm) depending on mount mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, int32_t pointing_a, int32_t pointing_b, int32_t pointing_c)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, pointing_a);
-	_mav_put_int32_t(buf, 6, pointing_b);
-	_mav_put_int32_t(buf, 10, pointing_c);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_mount_status_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.pointing_a = pointing_a;
-	packet.pointing_b = pointing_b;
-	packet.pointing_c = pointing_c;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 14);
-}
-
-/**
- * @brief Pack a mount_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param pointing_a pitch(deg*100) or lat, depending on mount mode
- * @param pointing_b roll(deg*100) or lon depending on mount mode
- * @param pointing_c yaw(deg*100) or alt (in cm) depending on mount mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mount_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,int32_t pointing_a,int32_t pointing_b,int32_t pointing_c)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, pointing_a);
-	_mav_put_int32_t(buf, 6, pointing_b);
-	_mav_put_int32_t(buf, 10, pointing_c);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_mount_status_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.pointing_a = pointing_a;
-	packet.pointing_b = pointing_b;
-	packet.pointing_c = pointing_c;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MOUNT_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14);
-}
-
-/**
- * @brief Encode a mount_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param mount_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_mount_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_mount_status_t* mount_status)
-{
-	return mavlink_msg_mount_status_pack(system_id, component_id, msg, mount_status->target_system, mount_status->target_component, mount_status->pointing_a, mount_status->pointing_b, mount_status->pointing_c);
-}
-
-/**
- * @brief Send a mount_status message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param pointing_a pitch(deg*100) or lat, depending on mount mode
- * @param pointing_b roll(deg*100) or lon depending on mount mode
- * @param pointing_c yaw(deg*100) or alt (in cm) depending on mount mode
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_mount_status_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, int32_t pointing_a, int32_t pointing_b, int32_t pointing_c)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, pointing_a);
-	_mav_put_int32_t(buf, 6, pointing_b);
-	_mav_put_int32_t(buf, 10, pointing_c);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_STATUS, buf, 14);
-#else
-	mavlink_mount_status_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.pointing_a = pointing_a;
-	packet.pointing_b = pointing_b;
-	packet.pointing_c = pointing_c;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOUNT_STATUS, (const char *)&packet, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE MOUNT_STATUS UNPACKING
-
-
-/**
- * @brief Get field target_system from mount_status message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_mount_status_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from mount_status message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_mount_status_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field pointing_a from mount_status message
- *
- * @return pitch(deg*100) or lat, depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_status_get_pointing_a(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  2);
-}
-
-/**
- * @brief Get field pointing_b from mount_status message
- *
- * @return roll(deg*100) or lon depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_status_get_pointing_b(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  6);
-}
-
-/**
- * @brief Get field pointing_c from mount_status message
- *
- * @return yaw(deg*100) or alt (in cm) depending on mount mode
- */
-static inline int32_t mavlink_msg_mount_status_get_pointing_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  10);
-}
-
-/**
- * @brief Decode a mount_status message into a struct
- *
- * @param msg The message to decode
- * @param mount_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_mount_status_decode(const mavlink_message_t* msg, mavlink_mount_status_t* mount_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mount_status->target_system = mavlink_msg_mount_status_get_target_system(msg);
-	mount_status->target_component = mavlink_msg_mount_status_get_target_component(msg);
-	mount_status->pointing_a = mavlink_msg_mount_status_get_pointing_a(msg);
-	mount_status->pointing_b = mavlink_msg_mount_status_get_pointing_b(msg);
-	mount_status->pointing_c = mavlink_msg_mount_status_get_pointing_c(msg);
-#else
-	memcpy(mount_status, _MAV_PAYLOAD(msg), 14);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_radio.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_radio.h
deleted file mode 100644
index 50b23b4e0..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_radio.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE RADIO PACKING
-
-#define MAVLINK_MSG_ID_RADIO 166
-
-typedef struct __mavlink_radio_t
-{
- uint8_t rssi; ///< local signal strength
- uint8_t remrssi; ///< remote signal strength
- uint8_t txbuf; ///< how full the tx buffer is as a percentage
- uint8_t noise; ///< background noise level
- uint8_t remnoise; ///< remote background noise level
- uint16_t rxerrors; ///< receive errors
- uint16_t fixed; ///< count of error corrected packets
-} mavlink_radio_t;
-
-#define MAVLINK_MSG_ID_RADIO_LEN 9
-#define MAVLINK_MSG_ID_166_LEN 9
-
-
-
-#define MAVLINK_MESSAGE_INFO_RADIO { \
-	"RADIO", \
-	7, \
-	{  { "rssi", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_radio_t, rssi) }, \
-         { "remrssi", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_radio_t, remrssi) }, \
-         { "txbuf", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_radio_t, txbuf) }, \
-         { "noise", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_radio_t, noise) }, \
-         { "remnoise", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_radio_t, remnoise) }, \
-         { "rxerrors", NULL, MAVLINK_TYPE_UINT16_T, 0, 5, offsetof(mavlink_radio_t, rxerrors) }, \
-         { "fixed", NULL, MAVLINK_TYPE_UINT16_T, 0, 7, offsetof(mavlink_radio_t, fixed) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a radio message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param rssi local signal strength
- * @param remrssi remote signal strength
- * @param txbuf how full the tx buffer is as a percentage
- * @param noise background noise level
- * @param remnoise remote background noise level
- * @param rxerrors receive errors
- * @param fixed count of error corrected packets
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t rssi, uint8_t remrssi, uint8_t txbuf, uint8_t noise, uint8_t remnoise, uint16_t rxerrors, uint16_t fixed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint8_t(buf, 0, rssi);
-	_mav_put_uint8_t(buf, 1, remrssi);
-	_mav_put_uint8_t(buf, 2, txbuf);
-	_mav_put_uint8_t(buf, 3, noise);
-	_mav_put_uint8_t(buf, 4, remnoise);
-	_mav_put_uint16_t(buf, 5, rxerrors);
-	_mav_put_uint16_t(buf, 7, fixed);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 9);
-#else
-	mavlink_radio_t packet;
-	packet.rssi = rssi;
-	packet.remrssi = remrssi;
-	packet.txbuf = txbuf;
-	packet.noise = noise;
-	packet.remnoise = remnoise;
-	packet.rxerrors = rxerrors;
-	packet.fixed = fixed;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 9);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO;
-	return mavlink_finalize_message(msg, system_id, component_id, 9);
-}
-
-/**
- * @brief Pack a radio message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param rssi local signal strength
- * @param remrssi remote signal strength
- * @param txbuf how full the tx buffer is as a percentage
- * @param noise background noise level
- * @param remnoise remote background noise level
- * @param rxerrors receive errors
- * @param fixed count of error corrected packets
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t rssi,uint8_t remrssi,uint8_t txbuf,uint8_t noise,uint8_t remnoise,uint16_t rxerrors,uint16_t fixed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint8_t(buf, 0, rssi);
-	_mav_put_uint8_t(buf, 1, remrssi);
-	_mav_put_uint8_t(buf, 2, txbuf);
-	_mav_put_uint8_t(buf, 3, noise);
-	_mav_put_uint8_t(buf, 4, remnoise);
-	_mav_put_uint16_t(buf, 5, rxerrors);
-	_mav_put_uint16_t(buf, 7, fixed);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 9);
-#else
-	mavlink_radio_t packet;
-	packet.rssi = rssi;
-	packet.remrssi = remrssi;
-	packet.txbuf = txbuf;
-	packet.noise = noise;
-	packet.remnoise = remnoise;
-	packet.rxerrors = rxerrors;
-	packet.fixed = fixed;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 9);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 9);
-}
-
-/**
- * @brief Encode a radio struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param radio C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_radio_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_radio_t* radio)
-{
-	return mavlink_msg_radio_pack(system_id, component_id, msg, radio->rssi, radio->remrssi, radio->txbuf, radio->noise, radio->remnoise, radio->rxerrors, radio->fixed);
-}
-
-/**
- * @brief Send a radio message
- * @param chan MAVLink channel to send the message
- *
- * @param rssi local signal strength
- * @param remrssi remote signal strength
- * @param txbuf how full the tx buffer is as a percentage
- * @param noise background noise level
- * @param remnoise remote background noise level
- * @param rxerrors receive errors
- * @param fixed count of error corrected packets
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_radio_send(mavlink_channel_t chan, uint8_t rssi, uint8_t remrssi, uint8_t txbuf, uint8_t noise, uint8_t remnoise, uint16_t rxerrors, uint16_t fixed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint8_t(buf, 0, rssi);
-	_mav_put_uint8_t(buf, 1, remrssi);
-	_mav_put_uint8_t(buf, 2, txbuf);
-	_mav_put_uint8_t(buf, 3, noise);
-	_mav_put_uint8_t(buf, 4, remnoise);
-	_mav_put_uint16_t(buf, 5, rxerrors);
-	_mav_put_uint16_t(buf, 7, fixed);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO, buf, 9);
-#else
-	mavlink_radio_t packet;
-	packet.rssi = rssi;
-	packet.remrssi = remrssi;
-	packet.txbuf = txbuf;
-	packet.noise = noise;
-	packet.remnoise = remnoise;
-	packet.rxerrors = rxerrors;
-	packet.fixed = fixed;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO, (const char *)&packet, 9);
-#endif
-}
-
-#endif
-
-// MESSAGE RADIO UNPACKING
-
-
-/**
- * @brief Get field rssi from radio message
- *
- * @return local signal strength
- */
-static inline uint8_t mavlink_msg_radio_get_rssi(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field remrssi from radio message
- *
- * @return remote signal strength
- */
-static inline uint8_t mavlink_msg_radio_get_remrssi(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field txbuf from radio message
- *
- * @return how full the tx buffer is as a percentage
- */
-static inline uint8_t mavlink_msg_radio_get_txbuf(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field noise from radio message
- *
- * @return background noise level
- */
-static inline uint8_t mavlink_msg_radio_get_noise(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field remnoise from radio message
- *
- * @return remote background noise level
- */
-static inline uint8_t mavlink_msg_radio_get_remnoise(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field rxerrors from radio message
- *
- * @return receive errors
- */
-static inline uint16_t mavlink_msg_radio_get_rxerrors(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  5);
-}
-
-/**
- * @brief Get field fixed from radio message
- *
- * @return count of error corrected packets
- */
-static inline uint16_t mavlink_msg_radio_get_fixed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  7);
-}
-
-/**
- * @brief Decode a radio message into a struct
- *
- * @param msg The message to decode
- * @param radio C-struct to decode the message contents into
- */
-static inline void mavlink_msg_radio_decode(const mavlink_message_t* msg, mavlink_radio_t* radio)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	radio->rssi = mavlink_msg_radio_get_rssi(msg);
-	radio->remrssi = mavlink_msg_radio_get_remrssi(msg);
-	radio->txbuf = mavlink_msg_radio_get_txbuf(msg);
-	radio->noise = mavlink_msg_radio_get_noise(msg);
-	radio->remnoise = mavlink_msg_radio_get_remnoise(msg);
-	radio->rxerrors = mavlink_msg_radio_get_rxerrors(msg);
-	radio->fixed = mavlink_msg_radio_get_fixed(msg);
-#else
-	memcpy(radio, _MAV_PAYLOAD(msg), 9);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_sensor_offsets.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_sensor_offsets.h
deleted file mode 100644
index 3016ea9bd..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_sensor_offsets.h
+++ /dev/null
@@ -1,386 +0,0 @@
-// MESSAGE SENSOR_OFFSETS PACKING
-
-#define MAVLINK_MSG_ID_SENSOR_OFFSETS 150
-
-typedef struct __mavlink_sensor_offsets_t
-{
- int16_t mag_ofs_x; ///< magnetometer X offset
- int16_t mag_ofs_y; ///< magnetometer Y offset
- int16_t mag_ofs_z; ///< magnetometer Z offset
- float mag_declination; ///< magnetic declination (radians)
- int32_t raw_press; ///< raw pressure from barometer
- int32_t raw_temp; ///< raw temperature from barometer
- float gyro_cal_x; ///< gyro X calibration
- float gyro_cal_y; ///< gyro Y calibration
- float gyro_cal_z; ///< gyro Z calibration
- float accel_cal_x; ///< accel X calibration
- float accel_cal_y; ///< accel Y calibration
- float accel_cal_z; ///< accel Z calibration
-} mavlink_sensor_offsets_t;
-
-#define MAVLINK_MSG_ID_SENSOR_OFFSETS_LEN 42
-#define MAVLINK_MSG_ID_150_LEN 42
-
-
-
-#define MAVLINK_MESSAGE_INFO_SENSOR_OFFSETS { \
-	"SENSOR_OFFSETS", \
-	12, \
-	{  { "mag_ofs_x", NULL, MAVLINK_TYPE_INT16_T, 0, 0, offsetof(mavlink_sensor_offsets_t, mag_ofs_x) }, \
-         { "mag_ofs_y", NULL, MAVLINK_TYPE_INT16_T, 0, 2, offsetof(mavlink_sensor_offsets_t, mag_ofs_y) }, \
-         { "mag_ofs_z", NULL, MAVLINK_TYPE_INT16_T, 0, 4, offsetof(mavlink_sensor_offsets_t, mag_ofs_z) }, \
-         { "mag_declination", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_sensor_offsets_t, mag_declination) }, \
-         { "raw_press", NULL, MAVLINK_TYPE_INT32_T, 0, 10, offsetof(mavlink_sensor_offsets_t, raw_press) }, \
-         { "raw_temp", NULL, MAVLINK_TYPE_INT32_T, 0, 14, offsetof(mavlink_sensor_offsets_t, raw_temp) }, \
-         { "gyro_cal_x", NULL, MAVLINK_TYPE_FLOAT, 0, 18, offsetof(mavlink_sensor_offsets_t, gyro_cal_x) }, \
-         { "gyro_cal_y", NULL, MAVLINK_TYPE_FLOAT, 0, 22, offsetof(mavlink_sensor_offsets_t, gyro_cal_y) }, \
-         { "gyro_cal_z", NULL, MAVLINK_TYPE_FLOAT, 0, 26, offsetof(mavlink_sensor_offsets_t, gyro_cal_z) }, \
-         { "accel_cal_x", NULL, MAVLINK_TYPE_FLOAT, 0, 30, offsetof(mavlink_sensor_offsets_t, accel_cal_x) }, \
-         { "accel_cal_y", NULL, MAVLINK_TYPE_FLOAT, 0, 34, offsetof(mavlink_sensor_offsets_t, accel_cal_y) }, \
-         { "accel_cal_z", NULL, MAVLINK_TYPE_FLOAT, 0, 38, offsetof(mavlink_sensor_offsets_t, accel_cal_z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a sensor_offsets message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- * @param mag_declination magnetic declination (radians)
- * @param raw_press raw pressure from barometer
- * @param raw_temp raw temperature from barometer
- * @param gyro_cal_x gyro X calibration
- * @param gyro_cal_y gyro Y calibration
- * @param gyro_cal_z gyro Z calibration
- * @param accel_cal_x accel X calibration
- * @param accel_cal_y accel Y calibration
- * @param accel_cal_z accel Z calibration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_offsets_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       int16_t mag_ofs_x, int16_t mag_ofs_y, int16_t mag_ofs_z, float mag_declination, int32_t raw_press, int32_t raw_temp, float gyro_cal_x, float gyro_cal_y, float gyro_cal_z, float accel_cal_x, float accel_cal_y, float accel_cal_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-	_mav_put_int16_t(buf, 0, mag_ofs_x);
-	_mav_put_int16_t(buf, 2, mag_ofs_y);
-	_mav_put_int16_t(buf, 4, mag_ofs_z);
-	_mav_put_float(buf, 6, mag_declination);
-	_mav_put_int32_t(buf, 10, raw_press);
-	_mav_put_int32_t(buf, 14, raw_temp);
-	_mav_put_float(buf, 18, gyro_cal_x);
-	_mav_put_float(buf, 22, gyro_cal_y);
-	_mav_put_float(buf, 26, gyro_cal_z);
-	_mav_put_float(buf, 30, accel_cal_x);
-	_mav_put_float(buf, 34, accel_cal_y);
-	_mav_put_float(buf, 38, accel_cal_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_sensor_offsets_t packet;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-	packet.mag_declination = mag_declination;
-	packet.raw_press = raw_press;
-	packet.raw_temp = raw_temp;
-	packet.gyro_cal_x = gyro_cal_x;
-	packet.gyro_cal_y = gyro_cal_y;
-	packet.gyro_cal_z = gyro_cal_z;
-	packet.accel_cal_x = accel_cal_x;
-	packet.accel_cal_y = accel_cal_y;
-	packet.accel_cal_z = accel_cal_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_OFFSETS;
-	return mavlink_finalize_message(msg, system_id, component_id, 42);
-}
-
-/**
- * @brief Pack a sensor_offsets message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- * @param mag_declination magnetic declination (radians)
- * @param raw_press raw pressure from barometer
- * @param raw_temp raw temperature from barometer
- * @param gyro_cal_x gyro X calibration
- * @param gyro_cal_y gyro Y calibration
- * @param gyro_cal_z gyro Z calibration
- * @param accel_cal_x accel X calibration
- * @param accel_cal_y accel Y calibration
- * @param accel_cal_z accel Z calibration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_offsets_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           int16_t mag_ofs_x,int16_t mag_ofs_y,int16_t mag_ofs_z,float mag_declination,int32_t raw_press,int32_t raw_temp,float gyro_cal_x,float gyro_cal_y,float gyro_cal_z,float accel_cal_x,float accel_cal_y,float accel_cal_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-	_mav_put_int16_t(buf, 0, mag_ofs_x);
-	_mav_put_int16_t(buf, 2, mag_ofs_y);
-	_mav_put_int16_t(buf, 4, mag_ofs_z);
-	_mav_put_float(buf, 6, mag_declination);
-	_mav_put_int32_t(buf, 10, raw_press);
-	_mav_put_int32_t(buf, 14, raw_temp);
-	_mav_put_float(buf, 18, gyro_cal_x);
-	_mav_put_float(buf, 22, gyro_cal_y);
-	_mav_put_float(buf, 26, gyro_cal_z);
-	_mav_put_float(buf, 30, accel_cal_x);
-	_mav_put_float(buf, 34, accel_cal_y);
-	_mav_put_float(buf, 38, accel_cal_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_sensor_offsets_t packet;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-	packet.mag_declination = mag_declination;
-	packet.raw_press = raw_press;
-	packet.raw_temp = raw_temp;
-	packet.gyro_cal_x = gyro_cal_x;
-	packet.gyro_cal_y = gyro_cal_y;
-	packet.gyro_cal_z = gyro_cal_z;
-	packet.accel_cal_x = accel_cal_x;
-	packet.accel_cal_y = accel_cal_y;
-	packet.accel_cal_z = accel_cal_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_OFFSETS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 42);
-}
-
-/**
- * @brief Encode a sensor_offsets struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param sensor_offsets C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_sensor_offsets_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_sensor_offsets_t* sensor_offsets)
-{
-	return mavlink_msg_sensor_offsets_pack(system_id, component_id, msg, sensor_offsets->mag_ofs_x, sensor_offsets->mag_ofs_y, sensor_offsets->mag_ofs_z, sensor_offsets->mag_declination, sensor_offsets->raw_press, sensor_offsets->raw_temp, sensor_offsets->gyro_cal_x, sensor_offsets->gyro_cal_y, sensor_offsets->gyro_cal_z, sensor_offsets->accel_cal_x, sensor_offsets->accel_cal_y, sensor_offsets->accel_cal_z);
-}
-
-/**
- * @brief Send a sensor_offsets message
- * @param chan MAVLink channel to send the message
- *
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- * @param mag_declination magnetic declination (radians)
- * @param raw_press raw pressure from barometer
- * @param raw_temp raw temperature from barometer
- * @param gyro_cal_x gyro X calibration
- * @param gyro_cal_y gyro Y calibration
- * @param gyro_cal_z gyro Z calibration
- * @param accel_cal_x accel X calibration
- * @param accel_cal_y accel Y calibration
- * @param accel_cal_z accel Z calibration
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_sensor_offsets_send(mavlink_channel_t chan, int16_t mag_ofs_x, int16_t mag_ofs_y, int16_t mag_ofs_z, float mag_declination, int32_t raw_press, int32_t raw_temp, float gyro_cal_x, float gyro_cal_y, float gyro_cal_z, float accel_cal_x, float accel_cal_y, float accel_cal_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-	_mav_put_int16_t(buf, 0, mag_ofs_x);
-	_mav_put_int16_t(buf, 2, mag_ofs_y);
-	_mav_put_int16_t(buf, 4, mag_ofs_z);
-	_mav_put_float(buf, 6, mag_declination);
-	_mav_put_int32_t(buf, 10, raw_press);
-	_mav_put_int32_t(buf, 14, raw_temp);
-	_mav_put_float(buf, 18, gyro_cal_x);
-	_mav_put_float(buf, 22, gyro_cal_y);
-	_mav_put_float(buf, 26, gyro_cal_z);
-	_mav_put_float(buf, 30, accel_cal_x);
-	_mav_put_float(buf, 34, accel_cal_y);
-	_mav_put_float(buf, 38, accel_cal_z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_OFFSETS, buf, 42);
-#else
-	mavlink_sensor_offsets_t packet;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-	packet.mag_declination = mag_declination;
-	packet.raw_press = raw_press;
-	packet.raw_temp = raw_temp;
-	packet.gyro_cal_x = gyro_cal_x;
-	packet.gyro_cal_y = gyro_cal_y;
-	packet.gyro_cal_z = gyro_cal_z;
-	packet.accel_cal_x = accel_cal_x;
-	packet.accel_cal_y = accel_cal_y;
-	packet.accel_cal_z = accel_cal_z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_OFFSETS, (const char *)&packet, 42);
-#endif
-}
-
-#endif
-
-// MESSAGE SENSOR_OFFSETS UNPACKING
-
-
-/**
- * @brief Get field mag_ofs_x from sensor_offsets message
- *
- * @return magnetometer X offset
- */
-static inline int16_t mavlink_msg_sensor_offsets_get_mag_ofs_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  0);
-}
-
-/**
- * @brief Get field mag_ofs_y from sensor_offsets message
- *
- * @return magnetometer Y offset
- */
-static inline int16_t mavlink_msg_sensor_offsets_get_mag_ofs_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  2);
-}
-
-/**
- * @brief Get field mag_ofs_z from sensor_offsets message
- *
- * @return magnetometer Z offset
- */
-static inline int16_t mavlink_msg_sensor_offsets_get_mag_ofs_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  4);
-}
-
-/**
- * @brief Get field mag_declination from sensor_offsets message
- *
- * @return magnetic declination (radians)
- */
-static inline float mavlink_msg_sensor_offsets_get_mag_declination(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field raw_press from sensor_offsets message
- *
- * @return raw pressure from barometer
- */
-static inline int32_t mavlink_msg_sensor_offsets_get_raw_press(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  10);
-}
-
-/**
- * @brief Get field raw_temp from sensor_offsets message
- *
- * @return raw temperature from barometer
- */
-static inline int32_t mavlink_msg_sensor_offsets_get_raw_temp(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  14);
-}
-
-/**
- * @brief Get field gyro_cal_x from sensor_offsets message
- *
- * @return gyro X calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_gyro_cal_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  18);
-}
-
-/**
- * @brief Get field gyro_cal_y from sensor_offsets message
- *
- * @return gyro Y calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_gyro_cal_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  22);
-}
-
-/**
- * @brief Get field gyro_cal_z from sensor_offsets message
- *
- * @return gyro Z calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_gyro_cal_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  26);
-}
-
-/**
- * @brief Get field accel_cal_x from sensor_offsets message
- *
- * @return accel X calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_accel_cal_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  30);
-}
-
-/**
- * @brief Get field accel_cal_y from sensor_offsets message
- *
- * @return accel Y calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_accel_cal_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  34);
-}
-
-/**
- * @brief Get field accel_cal_z from sensor_offsets message
- *
- * @return accel Z calibration
- */
-static inline float mavlink_msg_sensor_offsets_get_accel_cal_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  38);
-}
-
-/**
- * @brief Decode a sensor_offsets message into a struct
- *
- * @param msg The message to decode
- * @param sensor_offsets C-struct to decode the message contents into
- */
-static inline void mavlink_msg_sensor_offsets_decode(const mavlink_message_t* msg, mavlink_sensor_offsets_t* sensor_offsets)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	sensor_offsets->mag_ofs_x = mavlink_msg_sensor_offsets_get_mag_ofs_x(msg);
-	sensor_offsets->mag_ofs_y = mavlink_msg_sensor_offsets_get_mag_ofs_y(msg);
-	sensor_offsets->mag_ofs_z = mavlink_msg_sensor_offsets_get_mag_ofs_z(msg);
-	sensor_offsets->mag_declination = mavlink_msg_sensor_offsets_get_mag_declination(msg);
-	sensor_offsets->raw_press = mavlink_msg_sensor_offsets_get_raw_press(msg);
-	sensor_offsets->raw_temp = mavlink_msg_sensor_offsets_get_raw_temp(msg);
-	sensor_offsets->gyro_cal_x = mavlink_msg_sensor_offsets_get_gyro_cal_x(msg);
-	sensor_offsets->gyro_cal_y = mavlink_msg_sensor_offsets_get_gyro_cal_y(msg);
-	sensor_offsets->gyro_cal_z = mavlink_msg_sensor_offsets_get_gyro_cal_z(msg);
-	sensor_offsets->accel_cal_x = mavlink_msg_sensor_offsets_get_accel_cal_x(msg);
-	sensor_offsets->accel_cal_y = mavlink_msg_sensor_offsets_get_accel_cal_y(msg);
-	sensor_offsets->accel_cal_z = mavlink_msg_sensor_offsets_get_accel_cal_z(msg);
-#else
-	memcpy(sensor_offsets, _MAV_PAYLOAD(msg), 42);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_set_mag_offsets.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_set_mag_offsets.h
deleted file mode 100644
index 99473e2f1..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_set_mag_offsets.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE SET_MAG_OFFSETS PACKING
-
-#define MAVLINK_MSG_ID_SET_MAG_OFFSETS 151
-
-typedef struct __mavlink_set_mag_offsets_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int16_t mag_ofs_x; ///< magnetometer X offset
- int16_t mag_ofs_y; ///< magnetometer Y offset
- int16_t mag_ofs_z; ///< magnetometer Z offset
-} mavlink_set_mag_offsets_t;
-
-#define MAVLINK_MSG_ID_SET_MAG_OFFSETS_LEN 8
-#define MAVLINK_MSG_ID_151_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_MAG_OFFSETS { \
-	"SET_MAG_OFFSETS", \
-	5, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_mag_offsets_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_mag_offsets_t, target_component) }, \
-         { "mag_ofs_x", NULL, MAVLINK_TYPE_INT16_T, 0, 2, offsetof(mavlink_set_mag_offsets_t, mag_ofs_x) }, \
-         { "mag_ofs_y", NULL, MAVLINK_TYPE_INT16_T, 0, 4, offsetof(mavlink_set_mag_offsets_t, mag_ofs_y) }, \
-         { "mag_ofs_z", NULL, MAVLINK_TYPE_INT16_T, 0, 6, offsetof(mavlink_set_mag_offsets_t, mag_ofs_z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_mag_offsets message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_mag_offsets_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, int16_t mag_ofs_x, int16_t mag_ofs_y, int16_t mag_ofs_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 2, mag_ofs_x);
-	_mav_put_int16_t(buf, 4, mag_ofs_y);
-	_mav_put_int16_t(buf, 6, mag_ofs_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_set_mag_offsets_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_MAG_OFFSETS;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a set_mag_offsets message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_mag_offsets_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,int16_t mag_ofs_x,int16_t mag_ofs_y,int16_t mag_ofs_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 2, mag_ofs_x);
-	_mav_put_int16_t(buf, 4, mag_ofs_y);
-	_mav_put_int16_t(buf, 6, mag_ofs_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_set_mag_offsets_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_MAG_OFFSETS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a set_mag_offsets struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_mag_offsets C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_mag_offsets_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_mag_offsets_t* set_mag_offsets)
-{
-	return mavlink_msg_set_mag_offsets_pack(system_id, component_id, msg, set_mag_offsets->target_system, set_mag_offsets->target_component, set_mag_offsets->mag_ofs_x, set_mag_offsets->mag_ofs_y, set_mag_offsets->mag_ofs_z);
-}
-
-/**
- * @brief Send a set_mag_offsets message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param mag_ofs_x magnetometer X offset
- * @param mag_ofs_y magnetometer Y offset
- * @param mag_ofs_z magnetometer Z offset
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_mag_offsets_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, int16_t mag_ofs_x, int16_t mag_ofs_y, int16_t mag_ofs_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 2, mag_ofs_x);
-	_mav_put_int16_t(buf, 4, mag_ofs_y);
-	_mav_put_int16_t(buf, 6, mag_ofs_z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_MAG_OFFSETS, buf, 8);
-#else
-	mavlink_set_mag_offsets_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.mag_ofs_x = mag_ofs_x;
-	packet.mag_ofs_y = mag_ofs_y;
-	packet.mag_ofs_z = mag_ofs_z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_MAG_OFFSETS, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_MAG_OFFSETS UNPACKING
-
-
-/**
- * @brief Get field target_system from set_mag_offsets message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_set_mag_offsets_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from set_mag_offsets message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_set_mag_offsets_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field mag_ofs_x from set_mag_offsets message
- *
- * @return magnetometer X offset
- */
-static inline int16_t mavlink_msg_set_mag_offsets_get_mag_ofs_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  2);
-}
-
-/**
- * @brief Get field mag_ofs_y from set_mag_offsets message
- *
- * @return magnetometer Y offset
- */
-static inline int16_t mavlink_msg_set_mag_offsets_get_mag_ofs_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  4);
-}
-
-/**
- * @brief Get field mag_ofs_z from set_mag_offsets message
- *
- * @return magnetometer Z offset
- */
-static inline int16_t mavlink_msg_set_mag_offsets_get_mag_ofs_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  6);
-}
-
-/**
- * @brief Decode a set_mag_offsets message into a struct
- *
- * @param msg The message to decode
- * @param set_mag_offsets C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_mag_offsets_decode(const mavlink_message_t* msg, mavlink_set_mag_offsets_t* set_mag_offsets)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_mag_offsets->target_system = mavlink_msg_set_mag_offsets_get_target_system(msg);
-	set_mag_offsets->target_component = mavlink_msg_set_mag_offsets_get_target_component(msg);
-	set_mag_offsets->mag_ofs_x = mavlink_msg_set_mag_offsets_get_mag_ofs_x(msg);
-	set_mag_offsets->mag_ofs_y = mavlink_msg_set_mag_offsets_get_mag_ofs_y(msg);
-	set_mag_offsets->mag_ofs_z = mavlink_msg_set_mag_offsets_get_mag_ofs_z(msg);
-#else
-	memcpy(set_mag_offsets, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_simstate.h b/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_simstate.h
deleted file mode 100644
index 05f9ca3cc..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_simstate.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE SIMSTATE PACKING
-
-#define MAVLINK_MSG_ID_SIMSTATE 164
-
-typedef struct __mavlink_simstate_t
-{
- float roll; ///< Roll angle (rad)
- float pitch; ///< Pitch angle (rad)
- float yaw; ///< Yaw angle (rad)
- float xacc; ///< X acceleration m/s/s
- float yacc; ///< Y acceleration m/s/s
- float zacc; ///< Z acceleration m/s/s
- float xgyro; ///< Angular speed around X axis rad/s
- float ygyro; ///< Angular speed around Y axis rad/s
- float zgyro; ///< Angular speed around Z axis rad/s
-} mavlink_simstate_t;
-
-#define MAVLINK_MSG_ID_SIMSTATE_LEN 36
-#define MAVLINK_MSG_ID_164_LEN 36
-
-
-
-#define MAVLINK_MESSAGE_INFO_SIMSTATE { \
-	"SIMSTATE", \
-	9, \
-	{  { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_simstate_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_simstate_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_simstate_t, yaw) }, \
-         { "xacc", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_simstate_t, xacc) }, \
-         { "yacc", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_simstate_t, yacc) }, \
-         { "zacc", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_simstate_t, zacc) }, \
-         { "xgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_simstate_t, xgyro) }, \
-         { "ygyro", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_simstate_t, ygyro) }, \
-         { "zgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_simstate_t, zgyro) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a simstate message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param xacc X acceleration m/s/s
- * @param yacc Y acceleration m/s/s
- * @param zacc Z acceleration m/s/s
- * @param xgyro Angular speed around X axis rad/s
- * @param ygyro Angular speed around Y axis rad/s
- * @param zgyro Angular speed around Z axis rad/s
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, roll);
-	_mav_put_float(buf, 4, pitch);
-	_mav_put_float(buf, 8, yaw);
-	_mav_put_float(buf, 12, xacc);
-	_mav_put_float(buf, 16, yacc);
-	_mav_put_float(buf, 20, zacc);
-	_mav_put_float(buf, 24, xgyro);
-	_mav_put_float(buf, 28, ygyro);
-	_mav_put_float(buf, 32, zgyro);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_simstate_t packet;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SIMSTATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 36);
-}
-
-/**
- * @brief Pack a simstate message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param xacc X acceleration m/s/s
- * @param yacc Y acceleration m/s/s
- * @param zacc Z acceleration m/s/s
- * @param xgyro Angular speed around X axis rad/s
- * @param ygyro Angular speed around Y axis rad/s
- * @param zgyro Angular speed around Z axis rad/s
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float roll,float pitch,float yaw,float xacc,float yacc,float zacc,float xgyro,float ygyro,float zgyro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, roll);
-	_mav_put_float(buf, 4, pitch);
-	_mav_put_float(buf, 8, yaw);
-	_mav_put_float(buf, 12, xacc);
-	_mav_put_float(buf, 16, yacc);
-	_mav_put_float(buf, 20, zacc);
-	_mav_put_float(buf, 24, xgyro);
-	_mav_put_float(buf, 28, ygyro);
-	_mav_put_float(buf, 32, zgyro);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_simstate_t packet;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SIMSTATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 36);
-}
-
-/**
- * @brief Encode a simstate struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param simstate C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_simstate_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_simstate_t* simstate)
-{
-	return mavlink_msg_simstate_pack(system_id, component_id, msg, simstate->roll, simstate->pitch, simstate->yaw, simstate->xacc, simstate->yacc, simstate->zacc, simstate->xgyro, simstate->ygyro, simstate->zgyro);
-}
-
-/**
- * @brief Send a simstate message
- * @param chan MAVLink channel to send the message
- *
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param xacc X acceleration m/s/s
- * @param yacc Y acceleration m/s/s
- * @param zacc Z acceleration m/s/s
- * @param xgyro Angular speed around X axis rad/s
- * @param ygyro Angular speed around Y axis rad/s
- * @param zgyro Angular speed around Z axis rad/s
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, roll);
-	_mav_put_float(buf, 4, pitch);
-	_mav_put_float(buf, 8, yaw);
-	_mav_put_float(buf, 12, xacc);
-	_mav_put_float(buf, 16, yacc);
-	_mav_put_float(buf, 20, zacc);
-	_mav_put_float(buf, 24, xgyro);
-	_mav_put_float(buf, 28, ygyro);
-	_mav_put_float(buf, 32, zgyro);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, buf, 36);
-#else
-	mavlink_simstate_t packet;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, (const char *)&packet, 36);
-#endif
-}
-
-#endif
-
-// MESSAGE SIMSTATE UNPACKING
-
-
-/**
- * @brief Get field roll from simstate message
- *
- * @return Roll angle (rad)
- */
-static inline float mavlink_msg_simstate_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field pitch from simstate message
- *
- * @return Pitch angle (rad)
- */
-static inline float mavlink_msg_simstate_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field yaw from simstate message
- *
- * @return Yaw angle (rad)
- */
-static inline float mavlink_msg_simstate_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field xacc from simstate message
- *
- * @return X acceleration m/s/s
- */
-static inline float mavlink_msg_simstate_get_xacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yacc from simstate message
- *
- * @return Y acceleration m/s/s
- */
-static inline float mavlink_msg_simstate_get_yacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field zacc from simstate message
- *
- * @return Z acceleration m/s/s
- */
-static inline float mavlink_msg_simstate_get_zacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field xgyro from simstate message
- *
- * @return Angular speed around X axis rad/s
- */
-static inline float mavlink_msg_simstate_get_xgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field ygyro from simstate message
- *
- * @return Angular speed around Y axis rad/s
- */
-static inline float mavlink_msg_simstate_get_ygyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field zgyro from simstate message
- *
- * @return Angular speed around Z axis rad/s
- */
-static inline float mavlink_msg_simstate_get_zgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Decode a simstate message into a struct
- *
- * @param msg The message to decode
- * @param simstate C-struct to decode the message contents into
- */
-static inline void mavlink_msg_simstate_decode(const mavlink_message_t* msg, mavlink_simstate_t* simstate)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	simstate->roll = mavlink_msg_simstate_get_roll(msg);
-	simstate->pitch = mavlink_msg_simstate_get_pitch(msg);
-	simstate->yaw = mavlink_msg_simstate_get_yaw(msg);
-	simstate->xacc = mavlink_msg_simstate_get_xacc(msg);
-	simstate->yacc = mavlink_msg_simstate_get_yacc(msg);
-	simstate->zacc = mavlink_msg_simstate_get_zacc(msg);
-	simstate->xgyro = mavlink_msg_simstate_get_xgyro(msg);
-	simstate->ygyro = mavlink_msg_simstate_get_ygyro(msg);
-	simstate->zgyro = mavlink_msg_simstate_get_zgyro(msg);
-#else
-	memcpy(simstate, _MAV_PAYLOAD(msg), 36);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/testsuite.h b/mavlink/include/mavlink/v0.9/ardupilotmega/testsuite.h
deleted file mode 100644
index a3ac5476c..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/testsuite.h
+++ /dev/null
@@ -1,908 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from ardupilotmega.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef ARDUPILOTMEGA_TESTSUITE_H
-#define ARDUPILOTMEGA_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_ardupilotmega(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_ardupilotmega(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_sensor_offsets(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_sensor_offsets_t packet_in = {
-		17235,
-	17339,
-	17443,
-	59.0,
-	963497984,
-	963498192,
-	143.0,
-	171.0,
-	199.0,
-	227.0,
-	255.0,
-	283.0,
-	};
-	mavlink_sensor_offsets_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.mag_ofs_x = packet_in.mag_ofs_x;
-        	packet1.mag_ofs_y = packet_in.mag_ofs_y;
-        	packet1.mag_ofs_z = packet_in.mag_ofs_z;
-        	packet1.mag_declination = packet_in.mag_declination;
-        	packet1.raw_press = packet_in.raw_press;
-        	packet1.raw_temp = packet_in.raw_temp;
-        	packet1.gyro_cal_x = packet_in.gyro_cal_x;
-        	packet1.gyro_cal_y = packet_in.gyro_cal_y;
-        	packet1.gyro_cal_z = packet_in.gyro_cal_z;
-        	packet1.accel_cal_x = packet_in.accel_cal_x;
-        	packet1.accel_cal_y = packet_in.accel_cal_y;
-        	packet1.accel_cal_z = packet_in.accel_cal_z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_offsets_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_sensor_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_offsets_pack(system_id, component_id, &msg , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z , packet1.mag_declination , packet1.raw_press , packet1.raw_temp , packet1.gyro_cal_x , packet1.gyro_cal_y , packet1.gyro_cal_z , packet1.accel_cal_x , packet1.accel_cal_y , packet1.accel_cal_z );
-	mavlink_msg_sensor_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_offsets_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z , packet1.mag_declination , packet1.raw_press , packet1.raw_temp , packet1.gyro_cal_x , packet1.gyro_cal_y , packet1.gyro_cal_z , packet1.accel_cal_x , packet1.accel_cal_y , packet1.accel_cal_z );
-	mavlink_msg_sensor_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_sensor_offsets_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_offsets_send(MAVLINK_COMM_1 , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z , packet1.mag_declination , packet1.raw_press , packet1.raw_temp , packet1.gyro_cal_x , packet1.gyro_cal_y , packet1.gyro_cal_z , packet1.accel_cal_x , packet1.accel_cal_y , packet1.accel_cal_z );
-	mavlink_msg_sensor_offsets_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_mag_offsets(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_mag_offsets_t packet_in = {
-		5,
-	72,
-	17339,
-	17443,
-	17547,
-	};
-	mavlink_set_mag_offsets_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.mag_ofs_x = packet_in.mag_ofs_x;
-        	packet1.mag_ofs_y = packet_in.mag_ofs_y;
-        	packet1.mag_ofs_z = packet_in.mag_ofs_z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mag_offsets_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_mag_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mag_offsets_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z );
-	mavlink_msg_set_mag_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mag_offsets_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z );
-	mavlink_msg_set_mag_offsets_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_mag_offsets_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mag_offsets_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.mag_ofs_x , packet1.mag_ofs_y , packet1.mag_ofs_z );
-	mavlink_msg_set_mag_offsets_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_meminfo(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_meminfo_t packet_in = {
-		17235,
-	17339,
-	};
-	mavlink_meminfo_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.brkval = packet_in.brkval;
-        	packet1.freemem = packet_in.freemem;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_meminfo_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_meminfo_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_meminfo_pack(system_id, component_id, &msg , packet1.brkval , packet1.freemem );
-	mavlink_msg_meminfo_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_meminfo_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.brkval , packet1.freemem );
-	mavlink_msg_meminfo_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_meminfo_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_meminfo_send(MAVLINK_COMM_1 , packet1.brkval , packet1.freemem );
-	mavlink_msg_meminfo_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ap_adc(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ap_adc_t packet_in = {
-		17235,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	};
-	mavlink_ap_adc_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.adc1 = packet_in.adc1;
-        	packet1.adc2 = packet_in.adc2;
-        	packet1.adc3 = packet_in.adc3;
-        	packet1.adc4 = packet_in.adc4;
-        	packet1.adc5 = packet_in.adc5;
-        	packet1.adc6 = packet_in.adc6;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ap_adc_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ap_adc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ap_adc_pack(system_id, component_id, &msg , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.adc5 , packet1.adc6 );
-	mavlink_msg_ap_adc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ap_adc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.adc5 , packet1.adc6 );
-	mavlink_msg_ap_adc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ap_adc_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ap_adc_send(MAVLINK_COMM_1 , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.adc5 , packet1.adc6 );
-	mavlink_msg_ap_adc_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_digicam_configure(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_digicam_configure_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	84,
-	151,
-	218,
-	29,
-	96,
-	163,
-	94.0,
-	};
-	mavlink_digicam_configure_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.mode = packet_in.mode;
-        	packet1.shutter_speed = packet_in.shutter_speed;
-        	packet1.aperture = packet_in.aperture;
-        	packet1.iso = packet_in.iso;
-        	packet1.exposure_type = packet_in.exposure_type;
-        	packet1.command_id = packet_in.command_id;
-        	packet1.engine_cut_off = packet_in.engine_cut_off;
-        	packet1.extra_param = packet_in.extra_param;
-        	packet1.extra_value = packet_in.extra_value;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_configure_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_digicam_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_configure_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.mode , packet1.shutter_speed , packet1.aperture , packet1.iso , packet1.exposure_type , packet1.command_id , packet1.engine_cut_off , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_configure_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.mode , packet1.shutter_speed , packet1.aperture , packet1.iso , packet1.exposure_type , packet1.command_id , packet1.engine_cut_off , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_digicam_configure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_configure_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.mode , packet1.shutter_speed , packet1.aperture , packet1.iso , packet1.exposure_type , packet1.command_id , packet1.engine_cut_off , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_configure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_digicam_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_digicam_control_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	84,
-	151,
-	218,
-	29,
-	80.0,
-	};
-	mavlink_digicam_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.session = packet_in.session;
-        	packet1.zoom_pos = packet_in.zoom_pos;
-        	packet1.zoom_step = packet_in.zoom_step;
-        	packet1.focus_lock = packet_in.focus_lock;
-        	packet1.shot = packet_in.shot;
-        	packet1.command_id = packet_in.command_id;
-        	packet1.extra_param = packet_in.extra_param;
-        	packet1.extra_value = packet_in.extra_value;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_digicam_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_control_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.session , packet1.zoom_pos , packet1.zoom_step , packet1.focus_lock , packet1.shot , packet1.command_id , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.session , packet1.zoom_pos , packet1.zoom_step , packet1.focus_lock , packet1.shot , packet1.command_id , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_digicam_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_digicam_control_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.session , packet1.zoom_pos , packet1.zoom_step , packet1.focus_lock , packet1.shot , packet1.command_id , packet1.extra_param , packet1.extra_value );
-	mavlink_msg_digicam_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_mount_configure(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_mount_configure_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	84,
-	};
-	mavlink_mount_configure_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.mount_mode = packet_in.mount_mode;
-        	packet1.stab_roll = packet_in.stab_roll;
-        	packet1.stab_pitch = packet_in.stab_pitch;
-        	packet1.stab_yaw = packet_in.stab_yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_configure_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_mount_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_configure_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.mount_mode , packet1.stab_roll , packet1.stab_pitch , packet1.stab_yaw );
-	mavlink_msg_mount_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_configure_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.mount_mode , packet1.stab_roll , packet1.stab_pitch , packet1.stab_yaw );
-	mavlink_msg_mount_configure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_mount_configure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_configure_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.mount_mode , packet1.stab_roll , packet1.stab_pitch , packet1.stab_yaw );
-	mavlink_msg_mount_configure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_mount_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_mount_control_t packet_in = {
-		5,
-	72,
-	963497568,
-	963497776,
-	963497984,
-	175,
-	};
-	mavlink_mount_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.input_a = packet_in.input_a;
-        	packet1.input_b = packet_in.input_b;
-        	packet1.input_c = packet_in.input_c;
-        	packet1.save_position = packet_in.save_position;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_mount_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_control_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.input_a , packet1.input_b , packet1.input_c , packet1.save_position );
-	mavlink_msg_mount_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.input_a , packet1.input_b , packet1.input_c , packet1.save_position );
-	mavlink_msg_mount_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_mount_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_control_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.input_a , packet1.input_b , packet1.input_c , packet1.save_position );
-	mavlink_msg_mount_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_mount_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_mount_status_t packet_in = {
-		5,
-	72,
-	963497568,
-	963497776,
-	963497984,
-	};
-	mavlink_mount_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.pointing_a = packet_in.pointing_a;
-        	packet1.pointing_b = packet_in.pointing_b;
-        	packet1.pointing_c = packet_in.pointing_c;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_mount_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_status_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.pointing_a , packet1.pointing_b , packet1.pointing_c );
-	mavlink_msg_mount_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.pointing_a , packet1.pointing_b , packet1.pointing_c );
-	mavlink_msg_mount_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_mount_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mount_status_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.pointing_a , packet1.pointing_b , packet1.pointing_c );
-	mavlink_msg_mount_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_fence_point(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_fence_point_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	45.0,
-	73.0,
-	};
-	mavlink_fence_point_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.idx = packet_in.idx;
-        	packet1.count = packet_in.count;
-        	packet1.lat = packet_in.lat;
-        	packet1.lng = packet_in.lng;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_point_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_fence_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_point_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.idx , packet1.count , packet1.lat , packet1.lng );
-	mavlink_msg_fence_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_point_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.idx , packet1.count , packet1.lat , packet1.lng );
-	mavlink_msg_fence_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_fence_point_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_point_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.idx , packet1.count , packet1.lat , packet1.lng );
-	mavlink_msg_fence_point_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_fence_fetch_point(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_fence_fetch_point_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_fence_fetch_point_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.idx = packet_in.idx;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_fetch_point_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_fence_fetch_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_fetch_point_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.idx );
-	mavlink_msg_fence_fetch_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_fetch_point_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.idx );
-	mavlink_msg_fence_fetch_point_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_fence_fetch_point_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_fetch_point_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.idx );
-	mavlink_msg_fence_fetch_point_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_fence_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_fence_status_t packet_in = {
-		5,
-	17287,
-	206,
-	963497672,
-	};
-	mavlink_fence_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.breach_status = packet_in.breach_status;
-        	packet1.breach_count = packet_in.breach_count;
-        	packet1.breach_type = packet_in.breach_type;
-        	packet1.breach_time = packet_in.breach_time;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_fence_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_status_pack(system_id, component_id, &msg , packet1.breach_status , packet1.breach_count , packet1.breach_type , packet1.breach_time );
-	mavlink_msg_fence_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.breach_status , packet1.breach_count , packet1.breach_type , packet1.breach_time );
-	mavlink_msg_fence_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_fence_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_fence_status_send(MAVLINK_COMM_1 , packet1.breach_status , packet1.breach_count , packet1.breach_type , packet1.breach_time );
-	mavlink_msg_fence_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ahrs(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ahrs_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	};
-	mavlink_ahrs_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.omegaIx = packet_in.omegaIx;
-        	packet1.omegaIy = packet_in.omegaIy;
-        	packet1.omegaIz = packet_in.omegaIz;
-        	packet1.accel_weight = packet_in.accel_weight;
-        	packet1.renorm_val = packet_in.renorm_val;
-        	packet1.error_rp = packet_in.error_rp;
-        	packet1.error_yaw = packet_in.error_yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ahrs_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ahrs_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ahrs_pack(system_id, component_id, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
-	mavlink_msg_ahrs_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ahrs_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
-	mavlink_msg_ahrs_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ahrs_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ahrs_send(MAVLINK_COMM_1 , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
-	mavlink_msg_ahrs_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_simstate_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	241.0,
-	};
-	mavlink_simstate_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.xacc = packet_in.xacc;
-        	packet1.yacc = packet_in.yacc;
-        	packet1.zacc = packet_in.zacc;
-        	packet1.xgyro = packet_in.xgyro;
-        	packet1.ygyro = packet_in.ygyro;
-        	packet1.zgyro = packet_in.zgyro;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_simstate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_pack(system_id, component_id, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
-	mavlink_msg_simstate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
-	mavlink_msg_simstate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_simstate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_send(MAVLINK_COMM_1 , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
-	mavlink_msg_simstate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_hwstatus(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_hwstatus_t packet_in = {
-		17235,
-	139,
-	};
-	mavlink_hwstatus_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.Vcc = packet_in.Vcc;
-        	packet1.I2Cerr = packet_in.I2Cerr;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hwstatus_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_hwstatus_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hwstatus_pack(system_id, component_id, &msg , packet1.Vcc , packet1.I2Cerr );
-	mavlink_msg_hwstatus_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hwstatus_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.Vcc , packet1.I2Cerr );
-	mavlink_msg_hwstatus_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_hwstatus_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hwstatus_send(MAVLINK_COMM_1 , packet1.Vcc , packet1.I2Cerr );
-	mavlink_msg_hwstatus_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_radio(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_radio_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	17495,
-	17599,
-	};
-	mavlink_radio_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.rssi = packet_in.rssi;
-        	packet1.remrssi = packet_in.remrssi;
-        	packet1.txbuf = packet_in.txbuf;
-        	packet1.noise = packet_in.noise;
-        	packet1.remnoise = packet_in.remnoise;
-        	packet1.rxerrors = packet_in.rxerrors;
-        	packet1.fixed = packet_in.fixed;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_radio_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_pack(system_id, component_id, &msg , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
-	mavlink_msg_radio_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
-	mavlink_msg_radio_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_radio_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_send(MAVLINK_COMM_1 , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
-	mavlink_msg_radio_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ardupilotmega(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_sensor_offsets(system_id, component_id, last_msg);
-	mavlink_test_set_mag_offsets(system_id, component_id, last_msg);
-	mavlink_test_meminfo(system_id, component_id, last_msg);
-	mavlink_test_ap_adc(system_id, component_id, last_msg);
-	mavlink_test_digicam_configure(system_id, component_id, last_msg);
-	mavlink_test_digicam_control(system_id, component_id, last_msg);
-	mavlink_test_mount_configure(system_id, component_id, last_msg);
-	mavlink_test_mount_control(system_id, component_id, last_msg);
-	mavlink_test_mount_status(system_id, component_id, last_msg);
-	mavlink_test_fence_point(system_id, component_id, last_msg);
-	mavlink_test_fence_fetch_point(system_id, component_id, last_msg);
-	mavlink_test_fence_status(system_id, component_id, last_msg);
-	mavlink_test_ahrs(system_id, component_id, last_msg);
-	mavlink_test_simstate(system_id, component_id, last_msg);
-	mavlink_test_hwstatus(system_id, component_id, last_msg);
-	mavlink_test_radio(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // ARDUPILOTMEGA_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/ardupilotmega/version.h b/mavlink/include/mavlink/v0.9/ardupilotmega/version.h
deleted file mode 100644
index cbf2f9b1e..000000000
--- a/mavlink/include/mavlink/v0.9/ardupilotmega/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ardupilotmega.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:46 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/checksum.h b/mavlink/include/mavlink/v0.9/checksum.h
deleted file mode 100644
index b70991f5a..000000000
--- a/mavlink/include/mavlink/v0.9/checksum.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _CHECKSUM_H_
-#define _CHECKSUM_H_
-
-
-/**
- *
- *  CALCULATE THE CHECKSUM
- *
- */
-
-#define X25_INIT_CRC 0xffff
-#define X25_VALIDATE_CRC 0xf0b8
-
-/**
- * @brief Accumulate the X.25 CRC by adding one char at a time.
- *
- * The checksum function adds the hash of one char at a time to the
- * 16 bit checksum (uint16_t).
- *
- * @param data new char to hash
- * @param crcAccum the already accumulated checksum
- **/
-static inline void crc_accumulate(uint8_t data, uint16_t *crcAccum)
-{
-        /*Accumulate one byte of data into the CRC*/
-        uint8_t tmp;
-
-        tmp = data ^ (uint8_t)(*crcAccum &0xff);
-        tmp ^= (tmp<<4);
-        *crcAccum = (*crcAccum>>8) ^ (tmp<<8) ^ (tmp <<3) ^ (tmp>>4);
-}
-
-/**
- * @brief Initiliaze the buffer for the X.25 CRC
- *
- * @param crcAccum the 16 bit X.25 CRC
- */
-static inline void crc_init(uint16_t* crcAccum)
-{
-        *crcAccum = X25_INIT_CRC;
-}
-
-
-/**
- * @brief Calculates the X.25 checksum on a byte buffer
- *
- * @param  pBuffer buffer containing the byte array to hash
- * @param  length  length of the byte array
- * @return the checksum over the buffer bytes
- **/
-static inline uint16_t crc_calculate(uint8_t* pBuffer, uint16_t length)
-{
-        uint16_t crcTmp;
-        crc_init(&crcTmp);
-	while (length--) {
-                crc_accumulate(*pBuffer++, &crcTmp);
-        }
-        return crcTmp;
-}
-
-/**
- * @brief Accumulate the X.25 CRC by adding an array of bytes
- *
- * The checksum function adds the hash of one char at a time to the
- * 16 bit checksum (uint16_t).
- *
- * @param data new bytes to hash
- * @param crcAccum the already accumulated checksum
- **/
-static inline void crc_accumulate_buffer(uint16_t *crcAccum, const char *pBuffer, uint8_t length)
-{
-	const uint8_t *p = (const uint8_t *)pBuffer;
-	while (length--) {
-                crc_accumulate(*p++, crcAccum);
-        }
-}
-
-
-
-
-#endif /* _CHECKSUM_H_ */
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/mavlink/include/mavlink/v0.9/common/common.h b/mavlink/include/mavlink/v0.9/common/common.h
deleted file mode 100644
index 84538ed57..000000000
--- a/mavlink/include/mavlink/v0.9/common/common.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from common.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef COMMON_H
-#define COMMON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 4, 8, 14, 8, 28, 3, 32, 0, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 19, 2, 23, 21, 0, 37, 26, 101, 26, 16, 32, 32, 37, 32, 11, 17, 17, 16, 18, 36, 4, 4, 2, 2, 4, 2, 2, 3, 14, 12, 18, 16, 8, 27, 25, 18, 18, 24, 24, 0, 0, 0, 26, 16, 36, 5, 6, 56, 26, 21, 18, 0, 0, 18, 20, 20, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 14, 14, 51, 5}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 39, 190, 92, 191, 217, 104, 119, 0, 219, 60, 186, 10, 0, 0, 0, 0, 0, 0, 0, 89, 159, 162, 121, 0, 149, 222, 110, 179, 136, 66, 126, 185, 147, 112, 252, 162, 215, 229, 128, 9, 106, 101, 213, 4, 229, 21, 214, 215, 14, 206, 50, 157, 126, 108, 213, 95, 5, 127, 0, 0, 0, 57, 126, 130, 119, 193, 191, 236, 158, 143, 0, 0, 104, 123, 131, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 224, 60, 106, 7}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_BOOT, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACTION_ACK, MAVLINK_MESSAGE_INFO_ACTION, MAVLINK_MESSAGE_INFO_SET_MODE, MAVLINK_MESSAGE_INFO_SET_NAV_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_LOCAL_POSITION, MAVLINK_MESSAGE_INFO_GPS_RAW, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_WAYPOINT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST, MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST, MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT, MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL, MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED, MAVLINK_MESSAGE_INFO_WAYPOINT_ACK, MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_CONTROL_STATUS, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_POSITION_TARGET, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, MAVLINK_MESSAGE_INFO_SET_ALTITUDE, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_VFR_HUD, MAVLINK_MESSAGE_INFO_COMMAND, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG}
-#endif
-
-#include "../protocol.h"
-
-#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
-
-
-/** @brief Commands to be executed by the MAV. They can be executed on user request,
-      or as part of a mission script. If the action is used in a mission, the parameter mapping
-      to the waypoint/mission message is as follows:
-      Param 1, Param 2, Param 3, Param 4, X: Param 5, Y:Param 6, Z:Param 7. This command list is similar what
-      ARINC 424 is for commercial aircraft: A data format how to interpret waypoint/mission data. */
-#ifndef HAVE_ENUM_MAV_CMD
-#define HAVE_ENUM_MAV_CMD
-enum MAV_CMD
-{
-	MAV_CMD_NAV_WAYPOINT=16, /* Navigate to waypoint. |Hold time in decimal seconds. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Acceptance radius in meters (if the sphere with this radius is hit, the waypoint counts as reached)| 0 to pass through the WP, if > 0 radius in meters to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at waypoint (rotary wing)| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_UNLIM=17, /* Loiter around this waypoint an unlimited amount of time |Empty| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_TURNS=18, /* Loiter around this waypoint for X turns |Turns| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_LOITER_TIME=19, /* Loiter around this waypoint for X seconds |Seconds (decimal)| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_RETURN_TO_LAUNCH=20, /* Return to launch location |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_NAV_LAND=21, /* Land at location |Empty| Empty| Empty| Desired yaw angle.| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_TAKEOFF=22, /* Takeoff from ground / hand |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Empty| Yaw angle (if magnetometer present), ignored without magnetometer| Latitude| Longitude| Altitude|  */
-	MAV_CMD_NAV_ROI=80, /* Sets the region of interest (ROI) for a sensor set or the
-            vehicle itself. This can then be used by the vehicles control
-            system to control the vehicle attitude and the attitude of various
-            sensors such as cameras. |Region of intereset mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple ROI's)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z|  */
-	MAV_CMD_NAV_PATHPLANNING=81, /* Control autonomous path planning on the MAV. |0: Disable local obstacle avoidance / local path planning (without resetting map), 1: Enable local path planning, 2: Enable and reset local path planning| 0: Disable full path planning (without resetting map), 1: Enable, 2: Enable and reset map/occupancy grid, 3: Enable and reset planned route, but not occupancy grid| Empty| Yaw angle at goal, in compass degrees, [0..360]| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal|  */
-	MAV_CMD_NAV_LAST=95, /* NOP - This command is only used to mark the upper limit of the NAV/ACTION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_DELAY=112, /* Delay mission state machine. |Delay in seconds (decimal)| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_CHANGE_ALT=113, /* Ascend/descend at rate.  Delay mission state machine until desired altitude reached. |Descent / Ascend rate (m/s)| Empty| Empty| Empty| Empty| Empty| Finish Altitude|  */
-	MAV_CMD_CONDITION_DISTANCE=114, /* Delay mission state machine until within desired distance of next NAV point. |Distance (meters)| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_YAW=115, /* Reach a certain target angle. |target angle: [0-360], 0 is north| speed during yaw change:[deg per second]| direction: negative: counter clockwise, positive: clockwise [-1,1]| relative offset or absolute angle: [ 1,0]| Empty| Empty| Empty|  */
-	MAV_CMD_CONDITION_LAST=159, /* NOP - This command is only used to mark the upper limit of the CONDITION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_MODE=176, /* Set system mode. |Mode, as defined by ENUM MAV_MODE| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_JUMP=177, /* Jump to the desired command in the mission list.  Repeat this action only the specified number of times |Sequence number| Repeat count| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_CHANGE_SPEED=178, /* Change speed and/or throttle set points. |Speed type (0=Airspeed, 1=Ground Speed)| Speed  (m/s, -1 indicates no change)| Throttle  ( Percent, -1 indicates no change)| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_HOME=179, /* Changes the home location either to the current location or a specified location. |Use current (1=use current location, 0=use specified location)| Empty| Empty| Empty| Latitude| Longitude| Altitude|  */
-	MAV_CMD_DO_SET_PARAMETER=180, /* Set a system parameter.  Caution!  Use of this command requires knowledge of the numeric enumeration value of the parameter. |Parameter number| Parameter value| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_RELAY=181, /* Set a relay to a condition. |Relay number| Setting (1=on, 0=off, others possible depending on system hardware)| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_REPEAT_RELAY=182, /* Cycle a relay on and off for a desired number of cyles with a desired period. |Relay number| Cycle count| Cycle time (seconds, decimal)| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_SERVO=183, /* Set a servo to a desired PWM value. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_DO_REPEAT_SERVO=184, /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Cycle count| Cycle time (seconds)| Empty| Empty| Empty|  */
-	MAV_CMD_DO_CONTROL_VIDEO=200, /* Control onboard camera capturing. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds (decimal)| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty|  */
-	MAV_CMD_DO_SET_ROI=201, /* Sets the region of interest (ROI) for a sensor set or the
-                    vehicle itself. This can then be used by the vehicles control
-                    system to control the vehicle attitude and the attitude of various
-                    devices such as cameras.
-                 |Region of interest mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple cameras etc.)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z|  */
-	MAV_CMD_DO_LAST=240, /* NOP - This command is only used to mark the upper limit of the DO commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty|  */
-	MAV_CMD_PREFLIGHT_CALIBRATION=241, /* Trigger calibration. This command will be only accepted if in pre-flight mode. |Gyro calibration: 0: no, 1: yes| Magnetometer calibration: 0: no, 1: yes| Ground pressure: 0: no, 1: yes| Radio calibration: 0: no, 1: yes| Empty| Empty| Empty|  */
-	MAV_CMD_PREFLIGHT_STORAGE=245, /* Request storage of different parameter values and logs. This command will be only accepted if in pre-flight mode. |Parameter storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Mission storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Reserved| Reserved| Empty| Empty| Empty|  */
-	MAV_CMD_ENUM_END=246, /*  | */
-};
-#endif
-
-/** @brief Data stream IDs. A data stream is not a fixed set of messages, but rather a
-     recommendation to the autopilot software. Individual autopilots may or may not obey
-     the recommended messages.
-      */
-#ifndef HAVE_ENUM_MAV_DATA_STREAM
-#define HAVE_ENUM_MAV_DATA_STREAM
-enum MAV_DATA_STREAM
-{
-	MAV_DATA_STREAM_ALL=0, /* Enable all data streams | */
-	MAV_DATA_STREAM_RAW_SENSORS=1, /* Enable IMU_RAW, GPS_RAW, GPS_STATUS packets. | */
-	MAV_DATA_STREAM_EXTENDED_STATUS=2, /* Enable GPS_STATUS, CONTROL_STATUS, AUX_STATUS | */
-	MAV_DATA_STREAM_RC_CHANNELS=3, /* Enable RC_CHANNELS_SCALED, RC_CHANNELS_RAW, SERVO_OUTPUT_RAW | */
-	MAV_DATA_STREAM_RAW_CONTROLLER=4, /* Enable ATTITUDE_CONTROLLER_OUTPUT, POSITION_CONTROLLER_OUTPUT, NAV_CONTROLLER_OUTPUT. | */
-	MAV_DATA_STREAM_POSITION=6, /* Enable LOCAL_POSITION, GLOBAL_POSITION/GLOBAL_POSITION_INT messages. | */
-	MAV_DATA_STREAM_EXTRA1=10, /* Dependent on the autopilot | */
-	MAV_DATA_STREAM_EXTRA2=11, /* Dependent on the autopilot | */
-	MAV_DATA_STREAM_EXTRA3=12, /* Dependent on the autopilot | */
-	MAV_DATA_STREAM_ENUM_END=13, /*  | */
-};
-#endif
-
-/** @brief  The ROI (region of interest) for the vehicle. This can be
-                be used by the vehicle for camera/vehicle attitude alignment (see
-                MAV_CMD_NAV_ROI).
-             */
-#ifndef HAVE_ENUM_MAV_ROI
-#define HAVE_ENUM_MAV_ROI
-enum MAV_ROI
-{
-	MAV_ROI_NONE=0, /* No region of interest. | */
-	MAV_ROI_WPNEXT=1, /* Point toward next waypoint. | */
-	MAV_ROI_WPINDEX=2, /* Point toward given waypoint. | */
-	MAV_ROI_LOCATION=3, /* Point toward fixed location. | */
-	MAV_ROI_TARGET=4, /* Point toward of given id. | */
-	MAV_ROI_ENUM_END=5, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_heartbeat.h"
-#include "./mavlink_msg_boot.h"
-#include "./mavlink_msg_system_time.h"
-#include "./mavlink_msg_ping.h"
-#include "./mavlink_msg_system_time_utc.h"
-#include "./mavlink_msg_change_operator_control.h"
-#include "./mavlink_msg_change_operator_control_ack.h"
-#include "./mavlink_msg_auth_key.h"
-#include "./mavlink_msg_action_ack.h"
-#include "./mavlink_msg_action.h"
-#include "./mavlink_msg_set_mode.h"
-#include "./mavlink_msg_set_nav_mode.h"
-#include "./mavlink_msg_param_request_read.h"
-#include "./mavlink_msg_param_request_list.h"
-#include "./mavlink_msg_param_value.h"
-#include "./mavlink_msg_param_set.h"
-#include "./mavlink_msg_gps_raw_int.h"
-#include "./mavlink_msg_scaled_imu.h"
-#include "./mavlink_msg_gps_status.h"
-#include "./mavlink_msg_raw_imu.h"
-#include "./mavlink_msg_raw_pressure.h"
-#include "./mavlink_msg_scaled_pressure.h"
-#include "./mavlink_msg_attitude.h"
-#include "./mavlink_msg_local_position.h"
-#include "./mavlink_msg_global_position.h"
-#include "./mavlink_msg_gps_raw.h"
-#include "./mavlink_msg_sys_status.h"
-#include "./mavlink_msg_rc_channels_raw.h"
-#include "./mavlink_msg_rc_channels_scaled.h"
-#include "./mavlink_msg_servo_output_raw.h"
-#include "./mavlink_msg_waypoint.h"
-#include "./mavlink_msg_waypoint_request.h"
-#include "./mavlink_msg_waypoint_set_current.h"
-#include "./mavlink_msg_waypoint_current.h"
-#include "./mavlink_msg_waypoint_request_list.h"
-#include "./mavlink_msg_waypoint_count.h"
-#include "./mavlink_msg_waypoint_clear_all.h"
-#include "./mavlink_msg_waypoint_reached.h"
-#include "./mavlink_msg_waypoint_ack.h"
-#include "./mavlink_msg_gps_set_global_origin.h"
-#include "./mavlink_msg_gps_local_origin_set.h"
-#include "./mavlink_msg_local_position_setpoint_set.h"
-#include "./mavlink_msg_local_position_setpoint.h"
-#include "./mavlink_msg_control_status.h"
-#include "./mavlink_msg_safety_set_allowed_area.h"
-#include "./mavlink_msg_safety_allowed_area.h"
-#include "./mavlink_msg_set_roll_pitch_yaw_thrust.h"
-#include "./mavlink_msg_set_roll_pitch_yaw_speed_thrust.h"
-#include "./mavlink_msg_roll_pitch_yaw_thrust_setpoint.h"
-#include "./mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h"
-#include "./mavlink_msg_nav_controller_output.h"
-#include "./mavlink_msg_position_target.h"
-#include "./mavlink_msg_state_correction.h"
-#include "./mavlink_msg_set_altitude.h"
-#include "./mavlink_msg_request_data_stream.h"
-#include "./mavlink_msg_hil_state.h"
-#include "./mavlink_msg_hil_controls.h"
-#include "./mavlink_msg_manual_control.h"
-#include "./mavlink_msg_rc_channels_override.h"
-#include "./mavlink_msg_global_position_int.h"
-#include "./mavlink_msg_vfr_hud.h"
-#include "./mavlink_msg_command.h"
-#include "./mavlink_msg_command_ack.h"
-#include "./mavlink_msg_optical_flow.h"
-#include "./mavlink_msg_object_detection_event.h"
-#include "./mavlink_msg_debug_vect.h"
-#include "./mavlink_msg_named_value_float.h"
-#include "./mavlink_msg_named_value_int.h"
-#include "./mavlink_msg_statustext.h"
-#include "./mavlink_msg_debug.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // COMMON_H
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink.h b/mavlink/include/mavlink/v0.9/common/mavlink.h
deleted file mode 100644
index 02ff5bd39..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from common.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "common.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_action.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_action.h
deleted file mode 100644
index ada9aa7a2..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_action.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE ACTION PACKING
-
-#define MAVLINK_MSG_ID_ACTION 10
-
-typedef struct __mavlink_action_t
-{
- uint8_t target; ///< The system executing the action
- uint8_t target_component; ///< The component executing the action
- uint8_t action; ///< The action id
-} mavlink_action_t;
-
-#define MAVLINK_MSG_ID_ACTION_LEN 3
-#define MAVLINK_MSG_ID_10_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_ACTION { \
-	"ACTION", \
-	3, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_action_t, target) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_action_t, target_component) }, \
-         { "action", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_action_t, action) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a action message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t target_component, uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a action message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t target_component,uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a action struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param action C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_action_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_action_t* action)
-{
-	return mavlink_msg_action_pack(system_id, component_id, msg, action->target, action->target_component, action->action);
-}
-
-/**
- * @brief Send a action message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_action_send(mavlink_channel_t chan, uint8_t target, uint8_t target_component, uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION, buf, 3);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE ACTION UNPACKING
-
-
-/**
- * @brief Get field target from action message
- *
- * @return The system executing the action
- */
-static inline uint8_t mavlink_msg_action_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from action message
- *
- * @return The component executing the action
- */
-static inline uint8_t mavlink_msg_action_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field action from action message
- *
- * @return The action id
- */
-static inline uint8_t mavlink_msg_action_get_action(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a action message into a struct
- *
- * @param msg The message to decode
- * @param action C-struct to decode the message contents into
- */
-static inline void mavlink_msg_action_decode(const mavlink_message_t* msg, mavlink_action_t* action)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	action->target = mavlink_msg_action_get_target(msg);
-	action->target_component = mavlink_msg_action_get_target_component(msg);
-	action->action = mavlink_msg_action_get_action(msg);
-#else
-	memcpy(action, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_action_ack.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_action_ack.h
deleted file mode 100644
index a87b35b59..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_action_ack.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE ACTION_ACK PACKING
-
-#define MAVLINK_MSG_ID_ACTION_ACK 9
-
-typedef struct __mavlink_action_ack_t
-{
- uint8_t action; ///< The action id
- uint8_t result; ///< 0: Action DENIED, 1: Action executed
-} mavlink_action_ack_t;
-
-#define MAVLINK_MSG_ID_ACTION_ACK_LEN 2
-#define MAVLINK_MSG_ID_9_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_ACTION_ACK { \
-	"ACTION_ACK", \
-	2, \
-	{  { "action", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_action_ack_t, action) }, \
-         { "result", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_action_ack_t, result) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a action_ack message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_ack_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t action, uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION_ACK;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a action_ack message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_ack_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t action,uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION_ACK;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a action_ack struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param action_ack C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_action_ack_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_action_ack_t* action_ack)
-{
-	return mavlink_msg_action_ack_pack(system_id, component_id, msg, action_ack->action, action_ack->result);
-}
-
-/**
- * @brief Send a action_ack message
- * @param chan MAVLink channel to send the message
- *
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_action_ack_send(mavlink_channel_t chan, uint8_t action, uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION_ACK, buf, 2);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION_ACK, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE ACTION_ACK UNPACKING
-
-
-/**
- * @brief Get field action from action_ack message
- *
- * @return The action id
- */
-static inline uint8_t mavlink_msg_action_ack_get_action(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field result from action_ack message
- *
- * @return 0: Action DENIED, 1: Action executed
- */
-static inline uint8_t mavlink_msg_action_ack_get_result(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a action_ack message into a struct
- *
- * @param msg The message to decode
- * @param action_ack C-struct to decode the message contents into
- */
-static inline void mavlink_msg_action_ack_decode(const mavlink_message_t* msg, mavlink_action_ack_t* action_ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	action_ack->action = mavlink_msg_action_ack_get_action(msg);
-	action_ack->result = mavlink_msg_action_ack_get_result(msg);
-#else
-	memcpy(action_ack, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_attitude.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_attitude.h
deleted file mode 100644
index 188f1eb0f..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_attitude.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE ATTITUDE PACKING
-
-#define MAVLINK_MSG_ID_ATTITUDE 30
-
-typedef struct __mavlink_attitude_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float roll; ///< Roll angle (rad)
- float pitch; ///< Pitch angle (rad)
- float yaw; ///< Yaw angle (rad)
- float rollspeed; ///< Roll angular speed (rad/s)
- float pitchspeed; ///< Pitch angular speed (rad/s)
- float yawspeed; ///< Yaw angular speed (rad/s)
-} mavlink_attitude_t;
-
-#define MAVLINK_MSG_ID_ATTITUDE_LEN 32
-#define MAVLINK_MSG_ID_30_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_ATTITUDE { \
-	"ATTITUDE", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_attitude_t, usec) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_attitude_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_attitude_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_attitude_t, yaw) }, \
-         { "rollspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_attitude_t, rollspeed) }, \
-         { "pitchspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_attitude_t, pitchspeed) }, \
-         { "yawspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_attitude_t, yawspeed) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a attitude message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_attitude_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float roll, float pitch, float yaw, float rollspeed, float pitchspeed, float yawspeed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_attitude_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ATTITUDE;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a attitude message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_attitude_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float roll,float pitch,float yaw,float rollspeed,float pitchspeed,float yawspeed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_attitude_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ATTITUDE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a attitude struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param attitude C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_attitude_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_attitude_t* attitude)
-{
-	return mavlink_msg_attitude_pack(system_id, component_id, msg, attitude->usec, attitude->roll, attitude->pitch, attitude->yaw, attitude->rollspeed, attitude->pitchspeed, attitude->yawspeed);
-}
-
-/**
- * @brief Send a attitude message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_attitude_send(mavlink_channel_t chan, uint64_t usec, float roll, float pitch, float yaw, float rollspeed, float pitchspeed, float yawspeed)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE, buf, 32);
-#else
-	mavlink_attitude_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE ATTITUDE UNPACKING
-
-
-/**
- * @brief Get field usec from attitude message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_attitude_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field roll from attitude message
- *
- * @return Roll angle (rad)
- */
-static inline float mavlink_msg_attitude_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field pitch from attitude message
- *
- * @return Pitch angle (rad)
- */
-static inline float mavlink_msg_attitude_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw from attitude message
- *
- * @return Yaw angle (rad)
- */
-static inline float mavlink_msg_attitude_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field rollspeed from attitude message
- *
- * @return Roll angular speed (rad/s)
- */
-static inline float mavlink_msg_attitude_get_rollspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field pitchspeed from attitude message
- *
- * @return Pitch angular speed (rad/s)
- */
-static inline float mavlink_msg_attitude_get_pitchspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field yawspeed from attitude message
- *
- * @return Yaw angular speed (rad/s)
- */
-static inline float mavlink_msg_attitude_get_yawspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a attitude message into a struct
- *
- * @param msg The message to decode
- * @param attitude C-struct to decode the message contents into
- */
-static inline void mavlink_msg_attitude_decode(const mavlink_message_t* msg, mavlink_attitude_t* attitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	attitude->usec = mavlink_msg_attitude_get_usec(msg);
-	attitude->roll = mavlink_msg_attitude_get_roll(msg);
-	attitude->pitch = mavlink_msg_attitude_get_pitch(msg);
-	attitude->yaw = mavlink_msg_attitude_get_yaw(msg);
-	attitude->rollspeed = mavlink_msg_attitude_get_rollspeed(msg);
-	attitude->pitchspeed = mavlink_msg_attitude_get_pitchspeed(msg);
-	attitude->yawspeed = mavlink_msg_attitude_get_yawspeed(msg);
-#else
-	memcpy(attitude, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_auth_key.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_auth_key.h
deleted file mode 100644
index c451444ea..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_auth_key.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE AUTH_KEY PACKING
-
-#define MAVLINK_MSG_ID_AUTH_KEY 7
-
-typedef struct __mavlink_auth_key_t
-{
- char key[32]; ///< key
-} mavlink_auth_key_t;
-
-#define MAVLINK_MSG_ID_AUTH_KEY_LEN 32
-#define MAVLINK_MSG_ID_7_LEN 32
-
-#define MAVLINK_MSG_AUTH_KEY_FIELD_KEY_LEN 32
-
-#define MAVLINK_MESSAGE_INFO_AUTH_KEY { \
-	"AUTH_KEY", \
-	1, \
-	{  { "key", NULL, MAVLINK_TYPE_CHAR, 32, 0, offsetof(mavlink_auth_key_t, key) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a auth_key message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param key key
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_auth_key_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const char *key)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-
-	_mav_put_char_array(buf, 0, key, 32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_auth_key_t packet;
-
-	mav_array_memcpy(packet.key, key, sizeof(char)*32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AUTH_KEY;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a auth_key message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param key key
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_auth_key_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const char *key)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-
-	_mav_put_char_array(buf, 0, key, 32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_auth_key_t packet;
-
-	mav_array_memcpy(packet.key, key, sizeof(char)*32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AUTH_KEY;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a auth_key struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param auth_key C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_auth_key_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_auth_key_t* auth_key)
-{
-	return mavlink_msg_auth_key_pack(system_id, component_id, msg, auth_key->key);
-}
-
-/**
- * @brief Send a auth_key message
- * @param chan MAVLink channel to send the message
- *
- * @param key key
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_auth_key_send(mavlink_channel_t chan, const char *key)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-
-	_mav_put_char_array(buf, 0, key, 32);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AUTH_KEY, buf, 32);
-#else
-	mavlink_auth_key_t packet;
-
-	mav_array_memcpy(packet.key, key, sizeof(char)*32);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AUTH_KEY, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE AUTH_KEY UNPACKING
-
-
-/**
- * @brief Get field key from auth_key message
- *
- * @return key
- */
-static inline uint16_t mavlink_msg_auth_key_get_key(const mavlink_message_t* msg, char *key)
-{
-	return _MAV_RETURN_char_array(msg, key, 32,  0);
-}
-
-/**
- * @brief Decode a auth_key message into a struct
- *
- * @param msg The message to decode
- * @param auth_key C-struct to decode the message contents into
- */
-static inline void mavlink_msg_auth_key_decode(const mavlink_message_t* msg, mavlink_auth_key_t* auth_key)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_auth_key_get_key(msg, auth_key->key);
-#else
-	memcpy(auth_key, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_boot.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_boot.h
deleted file mode 100644
index 570949bd5..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_boot.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE BOOT PACKING
-
-#define MAVLINK_MSG_ID_BOOT 1
-
-typedef struct __mavlink_boot_t
-{
- uint32_t version; ///< The onboard software version
-} mavlink_boot_t;
-
-#define MAVLINK_MSG_ID_BOOT_LEN 4
-#define MAVLINK_MSG_ID_1_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_BOOT { \
-	"BOOT", \
-	1, \
-	{  { "version", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_boot_t, version) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a boot message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_boot_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BOOT;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a boot message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_boot_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BOOT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a boot struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param boot C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_boot_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_boot_t* boot)
-{
-	return mavlink_msg_boot_pack(system_id, component_id, msg, boot->version);
-}
-
-/**
- * @brief Send a boot message
- * @param chan MAVLink channel to send the message
- *
- * @param version The onboard software version
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_boot_send(mavlink_channel_t chan, uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BOOT, buf, 4);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BOOT, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE BOOT UNPACKING
-
-
-/**
- * @brief Get field version from boot message
- *
- * @return The onboard software version
- */
-static inline uint32_t mavlink_msg_boot_get_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Decode a boot message into a struct
- *
- * @param msg The message to decode
- * @param boot C-struct to decode the message contents into
- */
-static inline void mavlink_msg_boot_decode(const mavlink_message_t* msg, mavlink_boot_t* boot)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	boot->version = mavlink_msg_boot_get_version(msg);
-#else
-	memcpy(boot, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control.h
deleted file mode 100644
index 8fad932ea..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// MESSAGE CHANGE_OPERATOR_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL 5
-
-typedef struct __mavlink_change_operator_control_t
-{
- uint8_t target_system; ///< System the GCS requests control for
- uint8_t control_request; ///< 0: request control of this MAV, 1: Release control of this MAV
- uint8_t version; ///< 0: key as plaintext, 1-255: future, different hashing/encryption variants. The GCS should in general use the safest mode possible initially and then gradually move down the encryption level if it gets a NACK message indicating an encryption mismatch.
- char passkey[25]; ///< Password / Key, depending on version plaintext or encrypted. 25 or less characters, NULL terminated. The characters may involve A-Z, a-z, 0-9, and "!?,.-"
-} mavlink_change_operator_control_t;
-
-#define MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_LEN 28
-#define MAVLINK_MSG_ID_5_LEN 28
-
-#define MAVLINK_MSG_CHANGE_OPERATOR_CONTROL_FIELD_PASSKEY_LEN 25
-
-#define MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL { \
-	"CHANGE_OPERATOR_CONTROL", \
-	4, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_change_operator_control_t, target_system) }, \
-         { "control_request", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_change_operator_control_t, control_request) }, \
-         { "version", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_change_operator_control_t, version) }, \
-         { "passkey", NULL, MAVLINK_TYPE_CHAR, 25, 3, offsetof(mavlink_change_operator_control_t, passkey) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a change_operator_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System the GCS requests control for
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param version 0: key as plaintext, 1-255: future, different hashing/encryption variants. The GCS should in general use the safest mode possible initially and then gradually move down the encryption level if it gets a NACK message indicating an encryption mismatch.
- * @param passkey Password / Key, depending on version plaintext or encrypted. 25 or less characters, NULL terminated. The characters may involve A-Z, a-z, 0-9, and "!?,.-"
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_change_operator_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t control_request, uint8_t version, const char *passkey)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, version);
-	_mav_put_char_array(buf, 3, passkey, 25);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
-#else
-	mavlink_change_operator_control_t packet;
-	packet.target_system = target_system;
-	packet.control_request = control_request;
-	packet.version = version;
-	mav_array_memcpy(packet.passkey, passkey, sizeof(char)*25);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 28);
-}
-
-/**
- * @brief Pack a change_operator_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System the GCS requests control for
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param version 0: key as plaintext, 1-255: future, different hashing/encryption variants. The GCS should in general use the safest mode possible initially and then gradually move down the encryption level if it gets a NACK message indicating an encryption mismatch.
- * @param passkey Password / Key, depending on version plaintext or encrypted. 25 or less characters, NULL terminated. The characters may involve A-Z, a-z, 0-9, and "!?,.-"
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_change_operator_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t control_request,uint8_t version,const char *passkey)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, version);
-	_mav_put_char_array(buf, 3, passkey, 25);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
-#else
-	mavlink_change_operator_control_t packet;
-	packet.target_system = target_system;
-	packet.control_request = control_request;
-	packet.version = version;
-	mav_array_memcpy(packet.passkey, passkey, sizeof(char)*25);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 28);
-}
-
-/**
- * @brief Encode a change_operator_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param change_operator_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_change_operator_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_change_operator_control_t* change_operator_control)
-{
-	return mavlink_msg_change_operator_control_pack(system_id, component_id, msg, change_operator_control->target_system, change_operator_control->control_request, change_operator_control->version, change_operator_control->passkey);
-}
-
-/**
- * @brief Send a change_operator_control message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System the GCS requests control for
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param version 0: key as plaintext, 1-255: future, different hashing/encryption variants. The GCS should in general use the safest mode possible initially and then gradually move down the encryption level if it gets a NACK message indicating an encryption mismatch.
- * @param passkey Password / Key, depending on version plaintext or encrypted. 25 or less characters, NULL terminated. The characters may involve A-Z, a-z, 0-9, and "!?,.-"
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_change_operator_control_send(mavlink_channel_t chan, uint8_t target_system, uint8_t control_request, uint8_t version, const char *passkey)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[28];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, version);
-	_mav_put_char_array(buf, 3, passkey, 25);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL, buf, 28);
-#else
-	mavlink_change_operator_control_t packet;
-	packet.target_system = target_system;
-	packet.control_request = control_request;
-	packet.version = version;
-	mav_array_memcpy(packet.passkey, passkey, sizeof(char)*25);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL, (const char *)&packet, 28);
-#endif
-}
-
-#endif
-
-// MESSAGE CHANGE_OPERATOR_CONTROL UNPACKING
-
-
-/**
- * @brief Get field target_system from change_operator_control message
- *
- * @return System the GCS requests control for
- */
-static inline uint8_t mavlink_msg_change_operator_control_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field control_request from change_operator_control message
- *
- * @return 0: request control of this MAV, 1: Release control of this MAV
- */
-static inline uint8_t mavlink_msg_change_operator_control_get_control_request(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field version from change_operator_control message
- *
- * @return 0: key as plaintext, 1-255: future, different hashing/encryption variants. The GCS should in general use the safest mode possible initially and then gradually move down the encryption level if it gets a NACK message indicating an encryption mismatch.
- */
-static inline uint8_t mavlink_msg_change_operator_control_get_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field passkey from change_operator_control message
- *
- * @return Password / Key, depending on version plaintext or encrypted. 25 or less characters, NULL terminated. The characters may involve A-Z, a-z, 0-9, and "!?,.-"
- */
-static inline uint16_t mavlink_msg_change_operator_control_get_passkey(const mavlink_message_t* msg, char *passkey)
-{
-	return _MAV_RETURN_char_array(msg, passkey, 25,  3);
-}
-
-/**
- * @brief Decode a change_operator_control message into a struct
- *
- * @param msg The message to decode
- * @param change_operator_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_change_operator_control_decode(const mavlink_message_t* msg, mavlink_change_operator_control_t* change_operator_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	change_operator_control->target_system = mavlink_msg_change_operator_control_get_target_system(msg);
-	change_operator_control->control_request = mavlink_msg_change_operator_control_get_control_request(msg);
-	change_operator_control->version = mavlink_msg_change_operator_control_get_version(msg);
-	mavlink_msg_change_operator_control_get_passkey(msg, change_operator_control->passkey);
-#else
-	memcpy(change_operator_control, _MAV_PAYLOAD(msg), 28);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control_ack.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control_ack.h
deleted file mode 100644
index e9e195bbb..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_change_operator_control_ack.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE CHANGE_OPERATOR_CONTROL_ACK PACKING
-
-#define MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK 6
-
-typedef struct __mavlink_change_operator_control_ack_t
-{
- uint8_t gcs_system_id; ///< ID of the GCS this message 
- uint8_t control_request; ///< 0: request control of this MAV, 1: Release control of this MAV
- uint8_t ack; ///< 0: ACK, 1: NACK: Wrong passkey, 2: NACK: Unsupported passkey encryption method, 3: NACK: Already under control
-} mavlink_change_operator_control_ack_t;
-
-#define MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK_LEN 3
-#define MAVLINK_MSG_ID_6_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK { \
-	"CHANGE_OPERATOR_CONTROL_ACK", \
-	3, \
-	{  { "gcs_system_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_change_operator_control_ack_t, gcs_system_id) }, \
-         { "control_request", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_change_operator_control_ack_t, control_request) }, \
-         { "ack", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_change_operator_control_ack_t, ack) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a change_operator_control_ack message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param gcs_system_id ID of the GCS this message 
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param ack 0: ACK, 1: NACK: Wrong passkey, 2: NACK: Unsupported passkey encryption method, 3: NACK: Already under control
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_change_operator_control_ack_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t gcs_system_id, uint8_t control_request, uint8_t ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, gcs_system_id);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, ack);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_change_operator_control_ack_t packet;
-	packet.gcs_system_id = gcs_system_id;
-	packet.control_request = control_request;
-	packet.ack = ack;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a change_operator_control_ack message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param gcs_system_id ID of the GCS this message 
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param ack 0: ACK, 1: NACK: Wrong passkey, 2: NACK: Unsupported passkey encryption method, 3: NACK: Already under control
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_change_operator_control_ack_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t gcs_system_id,uint8_t control_request,uint8_t ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, gcs_system_id);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, ack);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_change_operator_control_ack_t packet;
-	packet.gcs_system_id = gcs_system_id;
-	packet.control_request = control_request;
-	packet.ack = ack;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a change_operator_control_ack struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param change_operator_control_ack C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_change_operator_control_ack_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_change_operator_control_ack_t* change_operator_control_ack)
-{
-	return mavlink_msg_change_operator_control_ack_pack(system_id, component_id, msg, change_operator_control_ack->gcs_system_id, change_operator_control_ack->control_request, change_operator_control_ack->ack);
-}
-
-/**
- * @brief Send a change_operator_control_ack message
- * @param chan MAVLink channel to send the message
- *
- * @param gcs_system_id ID of the GCS this message 
- * @param control_request 0: request control of this MAV, 1: Release control of this MAV
- * @param ack 0: ACK, 1: NACK: Wrong passkey, 2: NACK: Unsupported passkey encryption method, 3: NACK: Already under control
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_change_operator_control_ack_send(mavlink_channel_t chan, uint8_t gcs_system_id, uint8_t control_request, uint8_t ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, gcs_system_id);
-	_mav_put_uint8_t(buf, 1, control_request);
-	_mav_put_uint8_t(buf, 2, ack);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK, buf, 3);
-#else
-	mavlink_change_operator_control_ack_t packet;
-	packet.gcs_system_id = gcs_system_id;
-	packet.control_request = control_request;
-	packet.ack = ack;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE CHANGE_OPERATOR_CONTROL_ACK UNPACKING
-
-
-/**
- * @brief Get field gcs_system_id from change_operator_control_ack message
- *
- * @return ID of the GCS this message 
- */
-static inline uint8_t mavlink_msg_change_operator_control_ack_get_gcs_system_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field control_request from change_operator_control_ack message
- *
- * @return 0: request control of this MAV, 1: Release control of this MAV
- */
-static inline uint8_t mavlink_msg_change_operator_control_ack_get_control_request(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field ack from change_operator_control_ack message
- *
- * @return 0: ACK, 1: NACK: Wrong passkey, 2: NACK: Unsupported passkey encryption method, 3: NACK: Already under control
- */
-static inline uint8_t mavlink_msg_change_operator_control_ack_get_ack(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a change_operator_control_ack message into a struct
- *
- * @param msg The message to decode
- * @param change_operator_control_ack C-struct to decode the message contents into
- */
-static inline void mavlink_msg_change_operator_control_ack_decode(const mavlink_message_t* msg, mavlink_change_operator_control_ack_t* change_operator_control_ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	change_operator_control_ack->gcs_system_id = mavlink_msg_change_operator_control_ack_get_gcs_system_id(msg);
-	change_operator_control_ack->control_request = mavlink_msg_change_operator_control_ack_get_control_request(msg);
-	change_operator_control_ack->ack = mavlink_msg_change_operator_control_ack_get_ack(msg);
-#else
-	memcpy(change_operator_control_ack, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_command.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_command.h
deleted file mode 100644
index b5d44f8b2..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_command.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// MESSAGE COMMAND PACKING
-
-#define MAVLINK_MSG_ID_COMMAND 75
-
-typedef struct __mavlink_command_t
-{
- uint8_t target_system; ///< System which should execute the command
- uint8_t target_component; ///< Component which should execute the command, 0 for all components
- uint8_t command; ///< Command ID, as defined by MAV_CMD enum.
- uint8_t confirmation; ///< 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- float param1; ///< Parameter 1, as defined by MAV_CMD enum.
- float param2; ///< Parameter 2, as defined by MAV_CMD enum.
- float param3; ///< Parameter 3, as defined by MAV_CMD enum.
- float param4; ///< Parameter 4, as defined by MAV_CMD enum.
-} mavlink_command_t;
-
-#define MAVLINK_MSG_ID_COMMAND_LEN 20
-#define MAVLINK_MSG_ID_75_LEN 20
-
-
-
-#define MAVLINK_MESSAGE_INFO_COMMAND { \
-	"COMMAND", \
-	8, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_command_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_command_t, target_component) }, \
-         { "command", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_command_t, command) }, \
-         { "confirmation", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_command_t, confirmation) }, \
-         { "param1", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_command_t, param1) }, \
-         { "param2", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_command_t, param2) }, \
-         { "param3", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_command_t, param3) }, \
-         { "param4", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_command_t, param4) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a command message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t command, uint8_t confirmation, float param1, float param2, float param3, float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, command);
-	_mav_put_uint8_t(buf, 3, confirmation);
-	_mav_put_float(buf, 4, param1);
-	_mav_put_float(buf, 8, param2);
-	_mav_put_float(buf, 12, param3);
-	_mav_put_float(buf, 16, param4);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_command_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND;
-	return mavlink_finalize_message(msg, system_id, component_id, 20);
-}
-
-/**
- * @brief Pack a command message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t command,uint8_t confirmation,float param1,float param2,float param3,float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, command);
-	_mav_put_uint8_t(buf, 3, confirmation);
-	_mav_put_float(buf, 4, param1);
-	_mav_put_float(buf, 8, param2);
-	_mav_put_float(buf, 12, param3);
-	_mav_put_float(buf, 16, param4);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_command_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20);
-}
-
-/**
- * @brief Encode a command struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param command C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_command_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_command_t* command)
-{
-	return mavlink_msg_command_pack(system_id, component_id, msg, command->target_system, command->target_component, command->command, command->confirmation, command->param1, command->param2, command->param3, command->param4);
-}
-
-/**
- * @brief Send a command message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_command_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t command, uint8_t confirmation, float param1, float param2, float param3, float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, command);
-	_mav_put_uint8_t(buf, 3, confirmation);
-	_mav_put_float(buf, 4, param1);
-	_mav_put_float(buf, 8, param2);
-	_mav_put_float(buf, 12, param3);
-	_mav_put_float(buf, 16, param4);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND, buf, 20);
-#else
-	mavlink_command_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND, (const char *)&packet, 20);
-#endif
-}
-
-#endif
-
-// MESSAGE COMMAND UNPACKING
-
-
-/**
- * @brief Get field target_system from command message
- *
- * @return System which should execute the command
- */
-static inline uint8_t mavlink_msg_command_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from command message
- *
- * @return Component which should execute the command, 0 for all components
- */
-static inline uint8_t mavlink_msg_command_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field command from command message
- *
- * @return Command ID, as defined by MAV_CMD enum.
- */
-static inline uint8_t mavlink_msg_command_get_command(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field confirmation from command message
- *
- * @return 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- */
-static inline uint8_t mavlink_msg_command_get_confirmation(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field param1 from command message
- *
- * @return Parameter 1, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field param2 from command message
- *
- * @return Parameter 2, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field param3 from command message
- *
- * @return Parameter 3, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field param4 from command message
- *
- * @return Parameter 4, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Decode a command message into a struct
- *
- * @param msg The message to decode
- * @param command C-struct to decode the message contents into
- */
-static inline void mavlink_msg_command_decode(const mavlink_message_t* msg, mavlink_command_t* command)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	command->target_system = mavlink_msg_command_get_target_system(msg);
-	command->target_component = mavlink_msg_command_get_target_component(msg);
-	command->command = mavlink_msg_command_get_command(msg);
-	command->confirmation = mavlink_msg_command_get_confirmation(msg);
-	command->param1 = mavlink_msg_command_get_param1(msg);
-	command->param2 = mavlink_msg_command_get_param2(msg);
-	command->param3 = mavlink_msg_command_get_param3(msg);
-	command->param4 = mavlink_msg_command_get_param4(msg);
-#else
-	memcpy(command, _MAV_PAYLOAD(msg), 20);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_command_ack.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_command_ack.h
deleted file mode 100644
index ee4c89dcf..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_command_ack.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE COMMAND_ACK PACKING
-
-#define MAVLINK_MSG_ID_COMMAND_ACK 76
-
-typedef struct __mavlink_command_ack_t
-{
- float command; ///< Current airspeed in m/s
- float result; ///< 1: Action ACCEPTED and EXECUTED, 1: Action TEMPORARY REJECTED/DENIED, 2: Action PERMANENTLY DENIED, 3: Action UNKNOWN/UNSUPPORTED, 4: Requesting CONFIRMATION
-} mavlink_command_ack_t;
-
-#define MAVLINK_MSG_ID_COMMAND_ACK_LEN 8
-#define MAVLINK_MSG_ID_76_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_COMMAND_ACK { \
-	"COMMAND_ACK", \
-	2, \
-	{  { "command", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_command_ack_t, command) }, \
-         { "result", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_command_ack_t, result) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a command_ack message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param command Current airspeed in m/s
- * @param result 1: Action ACCEPTED and EXECUTED, 1: Action TEMPORARY REJECTED/DENIED, 2: Action PERMANENTLY DENIED, 3: Action UNKNOWN/UNSUPPORTED, 4: Requesting CONFIRMATION
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_ack_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float command, float result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_float(buf, 0, command);
-	_mav_put_float(buf, 4, result);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_command_ack_t packet;
-	packet.command = command;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND_ACK;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a command_ack message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param command Current airspeed in m/s
- * @param result 1: Action ACCEPTED and EXECUTED, 1: Action TEMPORARY REJECTED/DENIED, 2: Action PERMANENTLY DENIED, 3: Action UNKNOWN/UNSUPPORTED, 4: Requesting CONFIRMATION
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_ack_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float command,float result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_float(buf, 0, command);
-	_mav_put_float(buf, 4, result);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_command_ack_t packet;
-	packet.command = command;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND_ACK;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a command_ack struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param command_ack C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_command_ack_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_command_ack_t* command_ack)
-{
-	return mavlink_msg_command_ack_pack(system_id, component_id, msg, command_ack->command, command_ack->result);
-}
-
-/**
- * @brief Send a command_ack message
- * @param chan MAVLink channel to send the message
- *
- * @param command Current airspeed in m/s
- * @param result 1: Action ACCEPTED and EXECUTED, 1: Action TEMPORARY REJECTED/DENIED, 2: Action PERMANENTLY DENIED, 3: Action UNKNOWN/UNSUPPORTED, 4: Requesting CONFIRMATION
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_command_ack_send(mavlink_channel_t chan, float command, float result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_float(buf, 0, command);
-	_mav_put_float(buf, 4, result);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND_ACK, buf, 8);
-#else
-	mavlink_command_ack_t packet;
-	packet.command = command;
-	packet.result = result;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND_ACK, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE COMMAND_ACK UNPACKING
-
-
-/**
- * @brief Get field command from command_ack message
- *
- * @return Current airspeed in m/s
- */
-static inline float mavlink_msg_command_ack_get_command(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field result from command_ack message
- *
- * @return 1: Action ACCEPTED and EXECUTED, 1: Action TEMPORARY REJECTED/DENIED, 2: Action PERMANENTLY DENIED, 3: Action UNKNOWN/UNSUPPORTED, 4: Requesting CONFIRMATION
- */
-static inline float mavlink_msg_command_ack_get_result(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Decode a command_ack message into a struct
- *
- * @param msg The message to decode
- * @param command_ack C-struct to decode the message contents into
- */
-static inline void mavlink_msg_command_ack_decode(const mavlink_message_t* msg, mavlink_command_ack_t* command_ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	command_ack->command = mavlink_msg_command_ack_get_command(msg);
-	command_ack->result = mavlink_msg_command_ack_get_result(msg);
-#else
-	memcpy(command_ack, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_control_status.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_control_status.h
deleted file mode 100644
index ebc1568cc..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_control_status.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// MESSAGE CONTROL_STATUS PACKING
-
-#define MAVLINK_MSG_ID_CONTROL_STATUS 52
-
-typedef struct __mavlink_control_status_t
-{
- uint8_t position_fix; ///< Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- uint8_t vision_fix; ///< Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- uint8_t gps_fix; ///< GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- uint8_t ahrs_health; ///< Attitude estimation health: 0: poor, 255: excellent
- uint8_t control_att; ///< 0: Attitude control disabled, 1: enabled
- uint8_t control_pos_xy; ///< 0: X, Y position control disabled, 1: enabled
- uint8_t control_pos_z; ///< 0: Z position control disabled, 1: enabled
- uint8_t control_pos_yaw; ///< 0: Yaw angle control disabled, 1: enabled
-} mavlink_control_status_t;
-
-#define MAVLINK_MSG_ID_CONTROL_STATUS_LEN 8
-#define MAVLINK_MSG_ID_52_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_CONTROL_STATUS { \
-	"CONTROL_STATUS", \
-	8, \
-	{  { "position_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_control_status_t, position_fix) }, \
-         { "vision_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_control_status_t, vision_fix) }, \
-         { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_control_status_t, gps_fix) }, \
-         { "ahrs_health", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_control_status_t, ahrs_health) }, \
-         { "control_att", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_control_status_t, control_att) }, \
-         { "control_pos_xy", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_control_status_t, control_pos_xy) }, \
-         { "control_pos_z", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_control_status_t, control_pos_z) }, \
-         { "control_pos_yaw", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_control_status_t, control_pos_yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a control_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_control_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t position_fix, uint8_t vision_fix, uint8_t gps_fix, uint8_t ahrs_health, uint8_t control_att, uint8_t control_pos_xy, uint8_t control_pos_z, uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CONTROL_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a control_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_control_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t position_fix,uint8_t vision_fix,uint8_t gps_fix,uint8_t ahrs_health,uint8_t control_att,uint8_t control_pos_xy,uint8_t control_pos_z,uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CONTROL_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a control_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param control_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_control_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_control_status_t* control_status)
-{
-	return mavlink_msg_control_status_pack(system_id, component_id, msg, control_status->position_fix, control_status->vision_fix, control_status->gps_fix, control_status->ahrs_health, control_status->control_att, control_status->control_pos_xy, control_status->control_pos_z, control_status->control_pos_yaw);
-}
-
-/**
- * @brief Send a control_status message
- * @param chan MAVLink channel to send the message
- *
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_control_status_send(mavlink_channel_t chan, uint8_t position_fix, uint8_t vision_fix, uint8_t gps_fix, uint8_t ahrs_health, uint8_t control_att, uint8_t control_pos_xy, uint8_t control_pos_z, uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONTROL_STATUS, buf, 8);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONTROL_STATUS, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE CONTROL_STATUS UNPACKING
-
-
-/**
- * @brief Get field position_fix from control_status message
- *
- * @return Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_position_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field vision_fix from control_status message
- *
- * @return Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_vision_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field gps_fix from control_status message
- *
- * @return GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_gps_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field ahrs_health from control_status message
- *
- * @return Attitude estimation health: 0: poor, 255: excellent
- */
-static inline uint8_t mavlink_msg_control_status_get_ahrs_health(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field control_att from control_status message
- *
- * @return 0: Attitude control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_att(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field control_pos_xy from control_status message
- *
- * @return 0: X, Y position control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_xy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field control_pos_z from control_status message
- *
- * @return 0: Z position control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field control_pos_yaw from control_status message
- *
- * @return 0: Yaw angle control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Decode a control_status message into a struct
- *
- * @param msg The message to decode
- * @param control_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_control_status_decode(const mavlink_message_t* msg, mavlink_control_status_t* control_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	control_status->position_fix = mavlink_msg_control_status_get_position_fix(msg);
-	control_status->vision_fix = mavlink_msg_control_status_get_vision_fix(msg);
-	control_status->gps_fix = mavlink_msg_control_status_get_gps_fix(msg);
-	control_status->ahrs_health = mavlink_msg_control_status_get_ahrs_health(msg);
-	control_status->control_att = mavlink_msg_control_status_get_control_att(msg);
-	control_status->control_pos_xy = mavlink_msg_control_status_get_control_pos_xy(msg);
-	control_status->control_pos_z = mavlink_msg_control_status_get_control_pos_z(msg);
-	control_status->control_pos_yaw = mavlink_msg_control_status_get_control_pos_yaw(msg);
-#else
-	memcpy(control_status, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug.h
deleted file mode 100644
index 5a0fbdd71..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE DEBUG PACKING
-
-#define MAVLINK_MSG_ID_DEBUG 255
-
-typedef struct __mavlink_debug_t
-{
- uint8_t ind; ///< index of debug variable
- float value; ///< DEBUG value
-} mavlink_debug_t;
-
-#define MAVLINK_MSG_ID_DEBUG_LEN 5
-#define MAVLINK_MSG_ID_255_LEN 5
-
-
-
-#define MAVLINK_MESSAGE_INFO_DEBUG { \
-	"DEBUG", \
-	2, \
-	{  { "ind", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_debug_t, ind) }, \
-         { "value", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_debug_t, value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a debug message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param ind index of debug variable
- * @param value DEBUG value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_debug_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t ind, float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, ind);
-	_mav_put_float(buf, 1, value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 5);
-#else
-	mavlink_debug_t packet;
-	packet.ind = ind;
-	packet.value = value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 5);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DEBUG;
-	return mavlink_finalize_message(msg, system_id, component_id, 5);
-}
-
-/**
- * @brief Pack a debug message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param ind index of debug variable
- * @param value DEBUG value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_debug_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t ind,float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, ind);
-	_mav_put_float(buf, 1, value);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 5);
-#else
-	mavlink_debug_t packet;
-	packet.ind = ind;
-	packet.value = value;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 5);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DEBUG;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 5);
-}
-
-/**
- * @brief Encode a debug struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param debug C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_debug_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_debug_t* debug)
-{
-	return mavlink_msg_debug_pack(system_id, component_id, msg, debug->ind, debug->value);
-}
-
-/**
- * @brief Send a debug message
- * @param chan MAVLink channel to send the message
- *
- * @param ind index of debug variable
- * @param value DEBUG value
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_debug_send(mavlink_channel_t chan, uint8_t ind, float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, ind);
-	_mav_put_float(buf, 1, value);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DEBUG, buf, 5);
-#else
-	mavlink_debug_t packet;
-	packet.ind = ind;
-	packet.value = value;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DEBUG, (const char *)&packet, 5);
-#endif
-}
-
-#endif
-
-// MESSAGE DEBUG UNPACKING
-
-
-/**
- * @brief Get field ind from debug message
- *
- * @return index of debug variable
- */
-static inline uint8_t mavlink_msg_debug_get_ind(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field value from debug message
- *
- * @return DEBUG value
- */
-static inline float mavlink_msg_debug_get_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Decode a debug message into a struct
- *
- * @param msg The message to decode
- * @param debug C-struct to decode the message contents into
- */
-static inline void mavlink_msg_debug_decode(const mavlink_message_t* msg, mavlink_debug_t* debug)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	debug->ind = mavlink_msg_debug_get_ind(msg);
-	debug->value = mavlink_msg_debug_get_value(msg);
-#else
-	memcpy(debug, _MAV_PAYLOAD(msg), 5);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug_vect.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug_vect.h
deleted file mode 100644
index 51895f3ba..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_debug_vect.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// MESSAGE DEBUG_VECT PACKING
-
-#define MAVLINK_MSG_ID_DEBUG_VECT 251
-
-typedef struct __mavlink_debug_vect_t
-{
- char name[10]; ///< Name
- uint64_t usec; ///< Timestamp
- float x; ///< x
- float y; ///< y
- float z; ///< z
-} mavlink_debug_vect_t;
-
-#define MAVLINK_MSG_ID_DEBUG_VECT_LEN 30
-#define MAVLINK_MSG_ID_251_LEN 30
-
-#define MAVLINK_MSG_DEBUG_VECT_FIELD_NAME_LEN 10
-
-#define MAVLINK_MESSAGE_INFO_DEBUG_VECT { \
-	"DEBUG_VECT", \
-	5, \
-	{  { "name", NULL, MAVLINK_TYPE_CHAR, 10, 0, offsetof(mavlink_debug_vect_t, name) }, \
-         { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 10, offsetof(mavlink_debug_vect_t, usec) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 18, offsetof(mavlink_debug_vect_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 22, offsetof(mavlink_debug_vect_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 26, offsetof(mavlink_debug_vect_t, z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a debug_vect message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param name Name
- * @param usec Timestamp
- * @param x x
- * @param y y
- * @param z z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_debug_vect_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const char *name, uint64_t usec, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_uint64_t(buf, 10, usec);
-	_mav_put_float(buf, 18, x);
-	_mav_put_float(buf, 22, y);
-	_mav_put_float(buf, 26, z);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_debug_vect_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DEBUG_VECT;
-	return mavlink_finalize_message(msg, system_id, component_id, 30);
-}
-
-/**
- * @brief Pack a debug_vect message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param name Name
- * @param usec Timestamp
- * @param x x
- * @param y y
- * @param z z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_debug_vect_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const char *name,uint64_t usec,float x,float y,float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_uint64_t(buf, 10, usec);
-	_mav_put_float(buf, 18, x);
-	_mav_put_float(buf, 22, y);
-	_mav_put_float(buf, 26, z);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_debug_vect_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DEBUG_VECT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 30);
-}
-
-/**
- * @brief Encode a debug_vect struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param debug_vect C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_debug_vect_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_debug_vect_t* debug_vect)
-{
-	return mavlink_msg_debug_vect_pack(system_id, component_id, msg, debug_vect->name, debug_vect->usec, debug_vect->x, debug_vect->y, debug_vect->z);
-}
-
-/**
- * @brief Send a debug_vect message
- * @param chan MAVLink channel to send the message
- *
- * @param name Name
- * @param usec Timestamp
- * @param x x
- * @param y y
- * @param z z
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_debug_vect_send(mavlink_channel_t chan, const char *name, uint64_t usec, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_uint64_t(buf, 10, usec);
-	_mav_put_float(buf, 18, x);
-	_mav_put_float(buf, 22, y);
-	_mav_put_float(buf, 26, z);
-	_mav_put_char_array(buf, 0, name, 10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DEBUG_VECT, buf, 30);
-#else
-	mavlink_debug_vect_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DEBUG_VECT, (const char *)&packet, 30);
-#endif
-}
-
-#endif
-
-// MESSAGE DEBUG_VECT UNPACKING
-
-
-/**
- * @brief Get field name from debug_vect message
- *
- * @return Name
- */
-static inline uint16_t mavlink_msg_debug_vect_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 10,  0);
-}
-
-/**
- * @brief Get field usec from debug_vect message
- *
- * @return Timestamp
- */
-static inline uint64_t mavlink_msg_debug_vect_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  10);
-}
-
-/**
- * @brief Get field x from debug_vect message
- *
- * @return x
- */
-static inline float mavlink_msg_debug_vect_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  18);
-}
-
-/**
- * @brief Get field y from debug_vect message
- *
- * @return y
- */
-static inline float mavlink_msg_debug_vect_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  22);
-}
-
-/**
- * @brief Get field z from debug_vect message
- *
- * @return z
- */
-static inline float mavlink_msg_debug_vect_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  26);
-}
-
-/**
- * @brief Decode a debug_vect message into a struct
- *
- * @param msg The message to decode
- * @param debug_vect C-struct to decode the message contents into
- */
-static inline void mavlink_msg_debug_vect_decode(const mavlink_message_t* msg, mavlink_debug_vect_t* debug_vect)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_debug_vect_get_name(msg, debug_vect->name);
-	debug_vect->usec = mavlink_msg_debug_vect_get_usec(msg);
-	debug_vect->x = mavlink_msg_debug_vect_get_x(msg);
-	debug_vect->y = mavlink_msg_debug_vect_get_y(msg);
-	debug_vect->z = mavlink_msg_debug_vect_get_z(msg);
-#else
-	memcpy(debug_vect, _MAV_PAYLOAD(msg), 30);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position.h
deleted file mode 100644
index 5e0b9fe81..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE GLOBAL_POSITION PACKING
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION 33
-
-typedef struct __mavlink_global_position_t
-{
- uint64_t usec; ///< Timestamp (microseconds since unix epoch)
- float lat; ///< Latitude, in degrees
- float lon; ///< Longitude, in degrees
- float alt; ///< Absolute altitude, in meters
- float vx; ///< X Speed (in Latitude direction, positive: going north)
- float vy; ///< Y Speed (in Longitude direction, positive: going east)
- float vz; ///< Z Speed (in Altitude direction, positive: going up)
-} mavlink_global_position_t;
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION_LEN 32
-#define MAVLINK_MSG_ID_33_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_GLOBAL_POSITION { \
-	"GLOBAL_POSITION", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_global_position_t, usec) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_global_position_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_global_position_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_global_position_t, alt) }, \
-         { "vx", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_global_position_t, vx) }, \
-         { "vy", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_global_position_t, vy) }, \
-         { "vz", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_global_position_t, vz) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a global_position message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float lat, float lon, float alt, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a global_position message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float lat,float lon,float alt,float vx,float vy,float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a global_position struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param global_position C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_global_position_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_global_position_t* global_position)
-{
-	return mavlink_msg_global_position_pack(system_id, component_id, msg, global_position->usec, global_position->lat, global_position->lon, global_position->alt, global_position->vx, global_position->vy, global_position->vz);
-}
-
-/**
- * @brief Send a global_position message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_global_position_send(mavlink_channel_t chan, uint64_t usec, float lat, float lon, float alt, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION, buf, 32);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE GLOBAL_POSITION UNPACKING
-
-
-/**
- * @brief Get field usec from global_position message
- *
- * @return Timestamp (microseconds since unix epoch)
- */
-static inline uint64_t mavlink_msg_global_position_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field lat from global_position message
- *
- * @return Latitude, in degrees
- */
-static inline float mavlink_msg_global_position_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field lon from global_position message
- *
- * @return Longitude, in degrees
- */
-static inline float mavlink_msg_global_position_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field alt from global_position message
- *
- * @return Absolute altitude, in meters
- */
-static inline float mavlink_msg_global_position_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field vx from global_position message
- *
- * @return X Speed (in Latitude direction, positive: going north)
- */
-static inline float mavlink_msg_global_position_get_vx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field vy from global_position message
- *
- * @return Y Speed (in Longitude direction, positive: going east)
- */
-static inline float mavlink_msg_global_position_get_vy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field vz from global_position message
- *
- * @return Z Speed (in Altitude direction, positive: going up)
- */
-static inline float mavlink_msg_global_position_get_vz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a global_position message into a struct
- *
- * @param msg The message to decode
- * @param global_position C-struct to decode the message contents into
- */
-static inline void mavlink_msg_global_position_decode(const mavlink_message_t* msg, mavlink_global_position_t* global_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	global_position->usec = mavlink_msg_global_position_get_usec(msg);
-	global_position->lat = mavlink_msg_global_position_get_lat(msg);
-	global_position->lon = mavlink_msg_global_position_get_lon(msg);
-	global_position->alt = mavlink_msg_global_position_get_alt(msg);
-	global_position->vx = mavlink_msg_global_position_get_vx(msg);
-	global_position->vy = mavlink_msg_global_position_get_vy(msg);
-	global_position->vz = mavlink_msg_global_position_get_vz(msg);
-#else
-	memcpy(global_position, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position_int.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position_int.h
deleted file mode 100644
index 859a50049..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_global_position_int.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE GLOBAL_POSITION_INT PACKING
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION_INT 73
-
-typedef struct __mavlink_global_position_int_t
-{
- int32_t lat; ///< Latitude, expressed as * 1E7
- int32_t lon; ///< Longitude, expressed as * 1E7
- int32_t alt; ///< Altitude in meters, expressed as * 1000 (millimeters)
- int16_t vx; ///< Ground X Speed (Latitude), expressed as m/s * 100
- int16_t vy; ///< Ground Y Speed (Longitude), expressed as m/s * 100
- int16_t vz; ///< Ground Z Speed (Altitude), expressed as m/s * 100
-} mavlink_global_position_int_t;
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION_INT_LEN 18
-#define MAVLINK_MSG_ID_73_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT { \
-	"GLOBAL_POSITION_INT", \
-	6, \
-	{  { "lat", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_global_position_int_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_INT32_T, 0, 4, offsetof(mavlink_global_position_int_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_INT32_T, 0, 8, offsetof(mavlink_global_position_int_t, alt) }, \
-         { "vx", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_global_position_int_t, vx) }, \
-         { "vy", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_global_position_int_t, vy) }, \
-         { "vz", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_global_position_int_t, vz) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a global_position_int message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_int_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       int32_t lat, int32_t lon, int32_t alt, int16_t vx, int16_t vy, int16_t vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_int32_t(buf, 0, lat);
-	_mav_put_int32_t(buf, 4, lon);
-	_mav_put_int32_t(buf, 8, alt);
-	_mav_put_int16_t(buf, 12, vx);
-	_mav_put_int16_t(buf, 14, vy);
-	_mav_put_int16_t(buf, 16, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_global_position_int_t packet;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION_INT;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a global_position_int message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_int_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           int32_t lat,int32_t lon,int32_t alt,int16_t vx,int16_t vy,int16_t vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_int32_t(buf, 0, lat);
-	_mav_put_int32_t(buf, 4, lon);
-	_mav_put_int32_t(buf, 8, alt);
-	_mav_put_int16_t(buf, 12, vx);
-	_mav_put_int16_t(buf, 14, vy);
-	_mav_put_int16_t(buf, 16, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_global_position_int_t packet;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION_INT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a global_position_int struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param global_position_int C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_global_position_int_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_global_position_int_t* global_position_int)
-{
-	return mavlink_msg_global_position_int_pack(system_id, component_id, msg, global_position_int->lat, global_position_int->lon, global_position_int->alt, global_position_int->vx, global_position_int->vy, global_position_int->vz);
-}
-
-/**
- * @brief Send a global_position_int message
- * @param chan MAVLink channel to send the message
- *
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_global_position_int_send(mavlink_channel_t chan, int32_t lat, int32_t lon, int32_t alt, int16_t vx, int16_t vy, int16_t vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_int32_t(buf, 0, lat);
-	_mav_put_int32_t(buf, 4, lon);
-	_mav_put_int32_t(buf, 8, alt);
-	_mav_put_int16_t(buf, 12, vx);
-	_mav_put_int16_t(buf, 14, vy);
-	_mav_put_int16_t(buf, 16, vz);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION_INT, buf, 18);
-#else
-	mavlink_global_position_int_t packet;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION_INT, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE GLOBAL_POSITION_INT UNPACKING
-
-
-/**
- * @brief Get field lat from global_position_int message
- *
- * @return Latitude, expressed as * 1E7
- */
-static inline int32_t mavlink_msg_global_position_int_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  0);
-}
-
-/**
- * @brief Get field lon from global_position_int message
- *
- * @return Longitude, expressed as * 1E7
- */
-static inline int32_t mavlink_msg_global_position_int_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  4);
-}
-
-/**
- * @brief Get field alt from global_position_int message
- *
- * @return Altitude in meters, expressed as * 1000 (millimeters)
- */
-static inline int32_t mavlink_msg_global_position_int_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  8);
-}
-
-/**
- * @brief Get field vx from global_position_int message
- *
- * @return Ground X Speed (Latitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_global_position_int_get_vx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field vy from global_position_int message
- *
- * @return Ground Y Speed (Longitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_global_position_int_get_vy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field vz from global_position_int message
- *
- * @return Ground Z Speed (Altitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_global_position_int_get_vz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Decode a global_position_int message into a struct
- *
- * @param msg The message to decode
- * @param global_position_int C-struct to decode the message contents into
- */
-static inline void mavlink_msg_global_position_int_decode(const mavlink_message_t* msg, mavlink_global_position_int_t* global_position_int)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	global_position_int->lat = mavlink_msg_global_position_int_get_lat(msg);
-	global_position_int->lon = mavlink_msg_global_position_int_get_lon(msg);
-	global_position_int->alt = mavlink_msg_global_position_int_get_alt(msg);
-	global_position_int->vx = mavlink_msg_global_position_int_get_vx(msg);
-	global_position_int->vy = mavlink_msg_global_position_int_get_vy(msg);
-	global_position_int->vz = mavlink_msg_global_position_int_get_vz(msg);
-#else
-	memcpy(global_position_int, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_local_origin_set.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_local_origin_set.h
deleted file mode 100644
index 5faec2812..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_local_origin_set.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE GPS_LOCAL_ORIGIN_SET PACKING
-
-#define MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET 49
-
-typedef struct __mavlink_gps_local_origin_set_t
-{
- int32_t latitude; ///< Latitude (WGS84), expressed as * 1E7
- int32_t longitude; ///< Longitude (WGS84), expressed as * 1E7
- int32_t altitude; ///< Altitude(WGS84), expressed as * 1000
-} mavlink_gps_local_origin_set_t;
-
-#define MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET_LEN 12
-#define MAVLINK_MSG_ID_49_LEN 12
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET { \
-	"GPS_LOCAL_ORIGIN_SET", \
-	3, \
-	{  { "latitude", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_gps_local_origin_set_t, latitude) }, \
-         { "longitude", NULL, MAVLINK_TYPE_INT32_T, 0, 4, offsetof(mavlink_gps_local_origin_set_t, longitude) }, \
-         { "altitude", NULL, MAVLINK_TYPE_INT32_T, 0, 8, offsetof(mavlink_gps_local_origin_set_t, altitude) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_local_origin_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 12);
-}
-
-/**
- * @brief Pack a gps_local_origin_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           int32_t latitude,int32_t longitude,int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12);
-}
-
-/**
- * @brief Encode a gps_local_origin_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_local_origin_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_local_origin_set_t* gps_local_origin_set)
-{
-	return mavlink_msg_gps_local_origin_set_pack(system_id, component_id, msg, gps_local_origin_set->latitude, gps_local_origin_set->longitude, gps_local_origin_set->altitude);
-}
-
-/**
- * @brief Send a gps_local_origin_set message
- * @param chan MAVLink channel to send the message
- *
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_local_origin_set_send(mavlink_channel_t chan, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET, buf, 12);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET, (const char *)&packet, 12);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_LOCAL_ORIGIN_SET UNPACKING
-
-
-/**
- * @brief Get field latitude from gps_local_origin_set message
- *
- * @return Latitude (WGS84), expressed as * 1E7
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_latitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  0);
-}
-
-/**
- * @brief Get field longitude from gps_local_origin_set message
- *
- * @return Longitude (WGS84), expressed as * 1E7
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_longitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  4);
-}
-
-/**
- * @brief Get field altitude from gps_local_origin_set message
- *
- * @return Altitude(WGS84), expressed as * 1000
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_altitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  8);
-}
-
-/**
- * @brief Decode a gps_local_origin_set message into a struct
- *
- * @param msg The message to decode
- * @param gps_local_origin_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_local_origin_set_decode(const mavlink_message_t* msg, mavlink_gps_local_origin_set_t* gps_local_origin_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_local_origin_set->latitude = mavlink_msg_gps_local_origin_set_get_latitude(msg);
-	gps_local_origin_set->longitude = mavlink_msg_gps_local_origin_set_get_longitude(msg);
-	gps_local_origin_set->altitude = mavlink_msg_gps_local_origin_set_get_altitude(msg);
-#else
-	memcpy(gps_local_origin_set, _MAV_PAYLOAD(msg), 12);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw.h
deleted file mode 100644
index 255cb27be..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE GPS_RAW PACKING
-
-#define MAVLINK_MSG_ID_GPS_RAW 32
-
-typedef struct __mavlink_gps_raw_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- uint8_t fix_type; ///< 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- float lat; ///< Latitude in degrees
- float lon; ///< Longitude in degrees
- float alt; ///< Altitude in meters
- float eph; ///< GPS HDOP
- float epv; ///< GPS VDOP
- float v; ///< GPS ground speed
- float hdg; ///< Compass heading in degrees, 0..360 degrees
-} mavlink_gps_raw_t;
-
-#define MAVLINK_MSG_ID_GPS_RAW_LEN 37
-#define MAVLINK_MSG_ID_32_LEN 37
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_RAW { \
-	"GPS_RAW", \
-	9, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gps_raw_t, usec) }, \
-         { "fix_type", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_gps_raw_t, fix_type) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_gps_raw_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_gps_raw_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 17, offsetof(mavlink_gps_raw_t, alt) }, \
-         { "eph", NULL, MAVLINK_TYPE_FLOAT, 0, 21, offsetof(mavlink_gps_raw_t, eph) }, \
-         { "epv", NULL, MAVLINK_TYPE_FLOAT, 0, 25, offsetof(mavlink_gps_raw_t, epv) }, \
-         { "v", NULL, MAVLINK_TYPE_FLOAT, 0, 29, offsetof(mavlink_gps_raw_t, v) }, \
-         { "hdg", NULL, MAVLINK_TYPE_FLOAT, 0, 33, offsetof(mavlink_gps_raw_t, hdg) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_raw message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, uint8_t fix_type, float lat, float lon, float alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_float(buf, 9, lat);
-	_mav_put_float(buf, 13, lon);
-	_mav_put_float(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 37);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW;
-	return mavlink_finalize_message(msg, system_id, component_id, 37);
-}
-
-/**
- * @brief Pack a gps_raw message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,uint8_t fix_type,float lat,float lon,float alt,float eph,float epv,float v,float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_float(buf, 9, lat);
-	_mav_put_float(buf, 13, lon);
-	_mav_put_float(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 37);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 37);
-}
-
-/**
- * @brief Encode a gps_raw struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_raw C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_raw_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_raw_t* gps_raw)
-{
-	return mavlink_msg_gps_raw_pack(system_id, component_id, msg, gps_raw->usec, gps_raw->fix_type, gps_raw->lat, gps_raw->lon, gps_raw->alt, gps_raw->eph, gps_raw->epv, gps_raw->v, gps_raw->hdg);
-}
-
-/**
- * @brief Send a gps_raw message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_raw_send(mavlink_channel_t chan, uint64_t usec, uint8_t fix_type, float lat, float lon, float alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_float(buf, 9, lat);
-	_mav_put_float(buf, 13, lon);
-	_mav_put_float(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW, buf, 37);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW, (const char *)&packet, 37);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_RAW UNPACKING
-
-
-/**
- * @brief Get field usec from gps_raw message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_gps_raw_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field fix_type from gps_raw message
- *
- * @return 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- */
-static inline uint8_t mavlink_msg_gps_raw_get_fix_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field lat from gps_raw message
- *
- * @return Latitude in degrees
- */
-static inline float mavlink_msg_gps_raw_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field lon from gps_raw message
- *
- * @return Longitude in degrees
- */
-static inline float mavlink_msg_gps_raw_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field alt from gps_raw message
- *
- * @return Altitude in meters
- */
-static inline float mavlink_msg_gps_raw_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  17);
-}
-
-/**
- * @brief Get field eph from gps_raw message
- *
- * @return GPS HDOP
- */
-static inline float mavlink_msg_gps_raw_get_eph(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  21);
-}
-
-/**
- * @brief Get field epv from gps_raw message
- *
- * @return GPS VDOP
- */
-static inline float mavlink_msg_gps_raw_get_epv(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  25);
-}
-
-/**
- * @brief Get field v from gps_raw message
- *
- * @return GPS ground speed
- */
-static inline float mavlink_msg_gps_raw_get_v(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  29);
-}
-
-/**
- * @brief Get field hdg from gps_raw message
- *
- * @return Compass heading in degrees, 0..360 degrees
- */
-static inline float mavlink_msg_gps_raw_get_hdg(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  33);
-}
-
-/**
- * @brief Decode a gps_raw message into a struct
- *
- * @param msg The message to decode
- * @param gps_raw C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_raw_decode(const mavlink_message_t* msg, mavlink_gps_raw_t* gps_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_raw->usec = mavlink_msg_gps_raw_get_usec(msg);
-	gps_raw->fix_type = mavlink_msg_gps_raw_get_fix_type(msg);
-	gps_raw->lat = mavlink_msg_gps_raw_get_lat(msg);
-	gps_raw->lon = mavlink_msg_gps_raw_get_lon(msg);
-	gps_raw->alt = mavlink_msg_gps_raw_get_alt(msg);
-	gps_raw->eph = mavlink_msg_gps_raw_get_eph(msg);
-	gps_raw->epv = mavlink_msg_gps_raw_get_epv(msg);
-	gps_raw->v = mavlink_msg_gps_raw_get_v(msg);
-	gps_raw->hdg = mavlink_msg_gps_raw_get_hdg(msg);
-#else
-	memcpy(gps_raw, _MAV_PAYLOAD(msg), 37);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw_int.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw_int.h
deleted file mode 100644
index f1e7a05e5..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_raw_int.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE GPS_RAW_INT PACKING
-
-#define MAVLINK_MSG_ID_GPS_RAW_INT 25
-
-typedef struct __mavlink_gps_raw_int_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- uint8_t fix_type; ///< 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- int32_t lat; ///< Latitude in 1E7 degrees
- int32_t lon; ///< Longitude in 1E7 degrees
- int32_t alt; ///< Altitude in 1E3 meters (millimeters)
- float eph; ///< GPS HDOP
- float epv; ///< GPS VDOP
- float v; ///< GPS ground speed (m/s)
- float hdg; ///< Compass heading in degrees, 0..360 degrees
-} mavlink_gps_raw_int_t;
-
-#define MAVLINK_MSG_ID_GPS_RAW_INT_LEN 37
-#define MAVLINK_MSG_ID_25_LEN 37
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_RAW_INT { \
-	"GPS_RAW_INT", \
-	9, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gps_raw_int_t, usec) }, \
-         { "fix_type", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_gps_raw_int_t, fix_type) }, \
-         { "lat", NULL, MAVLINK_TYPE_INT32_T, 0, 9, offsetof(mavlink_gps_raw_int_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_INT32_T, 0, 13, offsetof(mavlink_gps_raw_int_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_INT32_T, 0, 17, offsetof(mavlink_gps_raw_int_t, alt) }, \
-         { "eph", NULL, MAVLINK_TYPE_FLOAT, 0, 21, offsetof(mavlink_gps_raw_int_t, eph) }, \
-         { "epv", NULL, MAVLINK_TYPE_FLOAT, 0, 25, offsetof(mavlink_gps_raw_int_t, epv) }, \
-         { "v", NULL, MAVLINK_TYPE_FLOAT, 0, 29, offsetof(mavlink_gps_raw_int_t, v) }, \
-         { "hdg", NULL, MAVLINK_TYPE_FLOAT, 0, 33, offsetof(mavlink_gps_raw_int_t, hdg) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_raw_int message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in 1E7 degrees
- * @param lon Longitude in 1E7 degrees
- * @param alt Altitude in 1E3 meters (millimeters)
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed (m/s)
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_int_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, uint8_t fix_type, int32_t lat, int32_t lon, int32_t alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_int32_t(buf, 9, lat);
-	_mav_put_int32_t(buf, 13, lon);
-	_mav_put_int32_t(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 37);
-#else
-	mavlink_gps_raw_int_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW_INT;
-	return mavlink_finalize_message(msg, system_id, component_id, 37);
-}
-
-/**
- * @brief Pack a gps_raw_int message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in 1E7 degrees
- * @param lon Longitude in 1E7 degrees
- * @param alt Altitude in 1E3 meters (millimeters)
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed (m/s)
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_int_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,uint8_t fix_type,int32_t lat,int32_t lon,int32_t alt,float eph,float epv,float v,float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_int32_t(buf, 9, lat);
-	_mav_put_int32_t(buf, 13, lon);
-	_mav_put_int32_t(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 37);
-#else
-	mavlink_gps_raw_int_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW_INT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 37);
-}
-
-/**
- * @brief Encode a gps_raw_int struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_raw_int C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_raw_int_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_raw_int_t* gps_raw_int)
-{
-	return mavlink_msg_gps_raw_int_pack(system_id, component_id, msg, gps_raw_int->usec, gps_raw_int->fix_type, gps_raw_int->lat, gps_raw_int->lon, gps_raw_int->alt, gps_raw_int->eph, gps_raw_int->epv, gps_raw_int->v, gps_raw_int->hdg);
-}
-
-/**
- * @brief Send a gps_raw_int message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in 1E7 degrees
- * @param lon Longitude in 1E7 degrees
- * @param alt Altitude in 1E3 meters (millimeters)
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed (m/s)
- * @param hdg Compass heading in degrees, 0..360 degrees
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_raw_int_send(mavlink_channel_t chan, uint64_t usec, uint8_t fix_type, int32_t lat, int32_t lon, int32_t alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_uint8_t(buf, 8, fix_type);
-	_mav_put_int32_t(buf, 9, lat);
-	_mav_put_int32_t(buf, 13, lon);
-	_mav_put_int32_t(buf, 17, alt);
-	_mav_put_float(buf, 21, eph);
-	_mav_put_float(buf, 25, epv);
-	_mav_put_float(buf, 29, v);
-	_mav_put_float(buf, 33, hdg);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW_INT, buf, 37);
-#else
-	mavlink_gps_raw_int_t packet;
-	packet.usec = usec;
-	packet.fix_type = fix_type;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW_INT, (const char *)&packet, 37);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_RAW_INT UNPACKING
-
-
-/**
- * @brief Get field usec from gps_raw_int message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_gps_raw_int_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field fix_type from gps_raw_int message
- *
- * @return 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- */
-static inline uint8_t mavlink_msg_gps_raw_int_get_fix_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field lat from gps_raw_int message
- *
- * @return Latitude in 1E7 degrees
- */
-static inline int32_t mavlink_msg_gps_raw_int_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  9);
-}
-
-/**
- * @brief Get field lon from gps_raw_int message
- *
- * @return Longitude in 1E7 degrees
- */
-static inline int32_t mavlink_msg_gps_raw_int_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  13);
-}
-
-/**
- * @brief Get field alt from gps_raw_int message
- *
- * @return Altitude in 1E3 meters (millimeters)
- */
-static inline int32_t mavlink_msg_gps_raw_int_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  17);
-}
-
-/**
- * @brief Get field eph from gps_raw_int message
- *
- * @return GPS HDOP
- */
-static inline float mavlink_msg_gps_raw_int_get_eph(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  21);
-}
-
-/**
- * @brief Get field epv from gps_raw_int message
- *
- * @return GPS VDOP
- */
-static inline float mavlink_msg_gps_raw_int_get_epv(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  25);
-}
-
-/**
- * @brief Get field v from gps_raw_int message
- *
- * @return GPS ground speed (m/s)
- */
-static inline float mavlink_msg_gps_raw_int_get_v(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  29);
-}
-
-/**
- * @brief Get field hdg from gps_raw_int message
- *
- * @return Compass heading in degrees, 0..360 degrees
- */
-static inline float mavlink_msg_gps_raw_int_get_hdg(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  33);
-}
-
-/**
- * @brief Decode a gps_raw_int message into a struct
- *
- * @param msg The message to decode
- * @param gps_raw_int C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_raw_int_decode(const mavlink_message_t* msg, mavlink_gps_raw_int_t* gps_raw_int)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_raw_int->usec = mavlink_msg_gps_raw_int_get_usec(msg);
-	gps_raw_int->fix_type = mavlink_msg_gps_raw_int_get_fix_type(msg);
-	gps_raw_int->lat = mavlink_msg_gps_raw_int_get_lat(msg);
-	gps_raw_int->lon = mavlink_msg_gps_raw_int_get_lon(msg);
-	gps_raw_int->alt = mavlink_msg_gps_raw_int_get_alt(msg);
-	gps_raw_int->eph = mavlink_msg_gps_raw_int_get_eph(msg);
-	gps_raw_int->epv = mavlink_msg_gps_raw_int_get_epv(msg);
-	gps_raw_int->v = mavlink_msg_gps_raw_int_get_v(msg);
-	gps_raw_int->hdg = mavlink_msg_gps_raw_int_get_hdg(msg);
-#else
-	memcpy(gps_raw_int, _MAV_PAYLOAD(msg), 37);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_set_global_origin.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_set_global_origin.h
deleted file mode 100644
index cdd1f242a..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_set_global_origin.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE GPS_SET_GLOBAL_ORIGIN PACKING
-
-#define MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN 48
-
-typedef struct __mavlink_gps_set_global_origin_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int32_t latitude; ///< global position * 1E7
- int32_t longitude; ///< global position * 1E7
- int32_t altitude; ///< global position * 1000
-} mavlink_gps_set_global_origin_t;
-
-#define MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN_LEN 14
-#define MAVLINK_MSG_ID_48_LEN 14
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN { \
-	"GPS_SET_GLOBAL_ORIGIN", \
-	5, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_gps_set_global_origin_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_gps_set_global_origin_t, target_component) }, \
-         { "latitude", NULL, MAVLINK_TYPE_INT32_T, 0, 2, offsetof(mavlink_gps_set_global_origin_t, latitude) }, \
-         { "longitude", NULL, MAVLINK_TYPE_INT32_T, 0, 6, offsetof(mavlink_gps_set_global_origin_t, longitude) }, \
-         { "altitude", NULL, MAVLINK_TYPE_INT32_T, 0, 10, offsetof(mavlink_gps_set_global_origin_t, altitude) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_set_global_origin message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, latitude);
-	_mav_put_int32_t(buf, 6, longitude);
-	_mav_put_int32_t(buf, 10, altitude);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN;
-	return mavlink_finalize_message(msg, system_id, component_id, 14);
-}
-
-/**
- * @brief Pack a gps_set_global_origin message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,int32_t latitude,int32_t longitude,int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, latitude);
-	_mav_put_int32_t(buf, 6, longitude);
-	_mav_put_int32_t(buf, 10, altitude);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14);
-}
-
-/**
- * @brief Encode a gps_set_global_origin struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_set_global_origin C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_set_global_origin_t* gps_set_global_origin)
-{
-	return mavlink_msg_gps_set_global_origin_pack(system_id, component_id, msg, gps_set_global_origin->target_system, gps_set_global_origin->target_component, gps_set_global_origin->latitude, gps_set_global_origin->longitude, gps_set_global_origin->altitude);
-}
-
-/**
- * @brief Send a gps_set_global_origin message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_set_global_origin_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int32_t(buf, 2, latitude);
-	_mav_put_int32_t(buf, 6, longitude);
-	_mav_put_int32_t(buf, 10, altitude);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN, buf, 14);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN, (const char *)&packet, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_SET_GLOBAL_ORIGIN UNPACKING
-
-
-/**
- * @brief Get field target_system from gps_set_global_origin message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_gps_set_global_origin_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from gps_set_global_origin message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_gps_set_global_origin_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field latitude from gps_set_global_origin message
- *
- * @return global position * 1E7
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_latitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  2);
-}
-
-/**
- * @brief Get field longitude from gps_set_global_origin message
- *
- * @return global position * 1E7
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_longitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  6);
-}
-
-/**
- * @brief Get field altitude from gps_set_global_origin message
- *
- * @return global position * 1000
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_altitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  10);
-}
-
-/**
- * @brief Decode a gps_set_global_origin message into a struct
- *
- * @param msg The message to decode
- * @param gps_set_global_origin C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_set_global_origin_decode(const mavlink_message_t* msg, mavlink_gps_set_global_origin_t* gps_set_global_origin)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_set_global_origin->target_system = mavlink_msg_gps_set_global_origin_get_target_system(msg);
-	gps_set_global_origin->target_component = mavlink_msg_gps_set_global_origin_get_target_component(msg);
-	gps_set_global_origin->latitude = mavlink_msg_gps_set_global_origin_get_latitude(msg);
-	gps_set_global_origin->longitude = mavlink_msg_gps_set_global_origin_get_longitude(msg);
-	gps_set_global_origin->altitude = mavlink_msg_gps_set_global_origin_get_altitude(msg);
-#else
-	memcpy(gps_set_global_origin, _MAV_PAYLOAD(msg), 14);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_status.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_status.h
deleted file mode 100644
index e13ffe382..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_gps_status.h
+++ /dev/null
@@ -1,252 +0,0 @@
-// MESSAGE GPS_STATUS PACKING
-
-#define MAVLINK_MSG_ID_GPS_STATUS 27
-
-typedef struct __mavlink_gps_status_t
-{
- uint8_t satellites_visible; ///< Number of satellites visible
- int8_t satellite_prn[20]; ///< Global satellite ID
- int8_t satellite_used[20]; ///< 0: Satellite not used, 1: used for localization
- int8_t satellite_elevation[20]; ///< Elevation (0: right on top of receiver, 90: on the horizon) of satellite
- int8_t satellite_azimuth[20]; ///< Direction of satellite, 0: 0 deg, 255: 360 deg.
- int8_t satellite_snr[20]; ///< Signal to noise ratio of satellite
-} mavlink_gps_status_t;
-
-#define MAVLINK_MSG_ID_GPS_STATUS_LEN 101
-#define MAVLINK_MSG_ID_27_LEN 101
-
-#define MAVLINK_MSG_GPS_STATUS_FIELD_SATELLITE_PRN_LEN 20
-#define MAVLINK_MSG_GPS_STATUS_FIELD_SATELLITE_USED_LEN 20
-#define MAVLINK_MSG_GPS_STATUS_FIELD_SATELLITE_ELEVATION_LEN 20
-#define MAVLINK_MSG_GPS_STATUS_FIELD_SATELLITE_AZIMUTH_LEN 20
-#define MAVLINK_MSG_GPS_STATUS_FIELD_SATELLITE_SNR_LEN 20
-
-#define MAVLINK_MESSAGE_INFO_GPS_STATUS { \
-	"GPS_STATUS", \
-	6, \
-	{  { "satellites_visible", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_gps_status_t, satellites_visible) }, \
-         { "satellite_prn", NULL, MAVLINK_TYPE_INT8_T, 20, 1, offsetof(mavlink_gps_status_t, satellite_prn) }, \
-         { "satellite_used", NULL, MAVLINK_TYPE_INT8_T, 20, 21, offsetof(mavlink_gps_status_t, satellite_used) }, \
-         { "satellite_elevation", NULL, MAVLINK_TYPE_INT8_T, 20, 41, offsetof(mavlink_gps_status_t, satellite_elevation) }, \
-         { "satellite_azimuth", NULL, MAVLINK_TYPE_INT8_T, 20, 61, offsetof(mavlink_gps_status_t, satellite_azimuth) }, \
-         { "satellite_snr", NULL, MAVLINK_TYPE_INT8_T, 20, 81, offsetof(mavlink_gps_status_t, satellite_snr) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param satellites_visible Number of satellites visible
- * @param satellite_prn Global satellite ID
- * @param satellite_used 0: Satellite not used, 1: used for localization
- * @param satellite_elevation Elevation (0: right on top of receiver, 90: on the horizon) of satellite
- * @param satellite_azimuth Direction of satellite, 0: 0 deg, 255: 360 deg.
- * @param satellite_snr Signal to noise ratio of satellite
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t satellites_visible, const int8_t *satellite_prn, const int8_t *satellite_used, const int8_t *satellite_elevation, const int8_t *satellite_azimuth, const int8_t *satellite_snr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[101];
-	_mav_put_uint8_t(buf, 0, satellites_visible);
-	_mav_put_int8_t_array(buf, 1, satellite_prn, 20);
-	_mav_put_int8_t_array(buf, 21, satellite_used, 20);
-	_mav_put_int8_t_array(buf, 41, satellite_elevation, 20);
-	_mav_put_int8_t_array(buf, 61, satellite_azimuth, 20);
-	_mav_put_int8_t_array(buf, 81, satellite_snr, 20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 101);
-#else
-	mavlink_gps_status_t packet;
-	packet.satellites_visible = satellites_visible;
-	mav_array_memcpy(packet.satellite_prn, satellite_prn, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_used, satellite_used, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_elevation, satellite_elevation, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_azimuth, satellite_azimuth, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_snr, satellite_snr, sizeof(int8_t)*20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 101);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 101);
-}
-
-/**
- * @brief Pack a gps_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param satellites_visible Number of satellites visible
- * @param satellite_prn Global satellite ID
- * @param satellite_used 0: Satellite not used, 1: used for localization
- * @param satellite_elevation Elevation (0: right on top of receiver, 90: on the horizon) of satellite
- * @param satellite_azimuth Direction of satellite, 0: 0 deg, 255: 360 deg.
- * @param satellite_snr Signal to noise ratio of satellite
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t satellites_visible,const int8_t *satellite_prn,const int8_t *satellite_used,const int8_t *satellite_elevation,const int8_t *satellite_azimuth,const int8_t *satellite_snr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[101];
-	_mav_put_uint8_t(buf, 0, satellites_visible);
-	_mav_put_int8_t_array(buf, 1, satellite_prn, 20);
-	_mav_put_int8_t_array(buf, 21, satellite_used, 20);
-	_mav_put_int8_t_array(buf, 41, satellite_elevation, 20);
-	_mav_put_int8_t_array(buf, 61, satellite_azimuth, 20);
-	_mav_put_int8_t_array(buf, 81, satellite_snr, 20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 101);
-#else
-	mavlink_gps_status_t packet;
-	packet.satellites_visible = satellites_visible;
-	mav_array_memcpy(packet.satellite_prn, satellite_prn, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_used, satellite_used, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_elevation, satellite_elevation, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_azimuth, satellite_azimuth, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_snr, satellite_snr, sizeof(int8_t)*20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 101);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 101);
-}
-
-/**
- * @brief Encode a gps_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_status_t* gps_status)
-{
-	return mavlink_msg_gps_status_pack(system_id, component_id, msg, gps_status->satellites_visible, gps_status->satellite_prn, gps_status->satellite_used, gps_status->satellite_elevation, gps_status->satellite_azimuth, gps_status->satellite_snr);
-}
-
-/**
- * @brief Send a gps_status message
- * @param chan MAVLink channel to send the message
- *
- * @param satellites_visible Number of satellites visible
- * @param satellite_prn Global satellite ID
- * @param satellite_used 0: Satellite not used, 1: used for localization
- * @param satellite_elevation Elevation (0: right on top of receiver, 90: on the horizon) of satellite
- * @param satellite_azimuth Direction of satellite, 0: 0 deg, 255: 360 deg.
- * @param satellite_snr Signal to noise ratio of satellite
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_status_send(mavlink_channel_t chan, uint8_t satellites_visible, const int8_t *satellite_prn, const int8_t *satellite_used, const int8_t *satellite_elevation, const int8_t *satellite_azimuth, const int8_t *satellite_snr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[101];
-	_mav_put_uint8_t(buf, 0, satellites_visible);
-	_mav_put_int8_t_array(buf, 1, satellite_prn, 20);
-	_mav_put_int8_t_array(buf, 21, satellite_used, 20);
-	_mav_put_int8_t_array(buf, 41, satellite_elevation, 20);
-	_mav_put_int8_t_array(buf, 61, satellite_azimuth, 20);
-	_mav_put_int8_t_array(buf, 81, satellite_snr, 20);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_STATUS, buf, 101);
-#else
-	mavlink_gps_status_t packet;
-	packet.satellites_visible = satellites_visible;
-	mav_array_memcpy(packet.satellite_prn, satellite_prn, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_used, satellite_used, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_elevation, satellite_elevation, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_azimuth, satellite_azimuth, sizeof(int8_t)*20);
-	mav_array_memcpy(packet.satellite_snr, satellite_snr, sizeof(int8_t)*20);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_STATUS, (const char *)&packet, 101);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_STATUS UNPACKING
-
-
-/**
- * @brief Get field satellites_visible from gps_status message
- *
- * @return Number of satellites visible
- */
-static inline uint8_t mavlink_msg_gps_status_get_satellites_visible(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field satellite_prn from gps_status message
- *
- * @return Global satellite ID
- */
-static inline uint16_t mavlink_msg_gps_status_get_satellite_prn(const mavlink_message_t* msg, int8_t *satellite_prn)
-{
-	return _MAV_RETURN_int8_t_array(msg, satellite_prn, 20,  1);
-}
-
-/**
- * @brief Get field satellite_used from gps_status message
- *
- * @return 0: Satellite not used, 1: used for localization
- */
-static inline uint16_t mavlink_msg_gps_status_get_satellite_used(const mavlink_message_t* msg, int8_t *satellite_used)
-{
-	return _MAV_RETURN_int8_t_array(msg, satellite_used, 20,  21);
-}
-
-/**
- * @brief Get field satellite_elevation from gps_status message
- *
- * @return Elevation (0: right on top of receiver, 90: on the horizon) of satellite
- */
-static inline uint16_t mavlink_msg_gps_status_get_satellite_elevation(const mavlink_message_t* msg, int8_t *satellite_elevation)
-{
-	return _MAV_RETURN_int8_t_array(msg, satellite_elevation, 20,  41);
-}
-
-/**
- * @brief Get field satellite_azimuth from gps_status message
- *
- * @return Direction of satellite, 0: 0 deg, 255: 360 deg.
- */
-static inline uint16_t mavlink_msg_gps_status_get_satellite_azimuth(const mavlink_message_t* msg, int8_t *satellite_azimuth)
-{
-	return _MAV_RETURN_int8_t_array(msg, satellite_azimuth, 20,  61);
-}
-
-/**
- * @brief Get field satellite_snr from gps_status message
- *
- * @return Signal to noise ratio of satellite
- */
-static inline uint16_t mavlink_msg_gps_status_get_satellite_snr(const mavlink_message_t* msg, int8_t *satellite_snr)
-{
-	return _MAV_RETURN_int8_t_array(msg, satellite_snr, 20,  81);
-}
-
-/**
- * @brief Decode a gps_status message into a struct
- *
- * @param msg The message to decode
- * @param gps_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_status_decode(const mavlink_message_t* msg, mavlink_gps_status_t* gps_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_status->satellites_visible = mavlink_msg_gps_status_get_satellites_visible(msg);
-	mavlink_msg_gps_status_get_satellite_prn(msg, gps_status->satellite_prn);
-	mavlink_msg_gps_status_get_satellite_used(msg, gps_status->satellite_used);
-	mavlink_msg_gps_status_get_satellite_elevation(msg, gps_status->satellite_elevation);
-	mavlink_msg_gps_status_get_satellite_azimuth(msg, gps_status->satellite_azimuth);
-	mavlink_msg_gps_status_get_satellite_snr(msg, gps_status->satellite_snr);
-#else
-	memcpy(gps_status, _MAV_PAYLOAD(msg), 101);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_heartbeat.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_heartbeat.h
deleted file mode 100644
index aad90d29f..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_heartbeat.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// MESSAGE HEARTBEAT PACKING
-
-#define MAVLINK_MSG_ID_HEARTBEAT 0
-
-typedef struct __mavlink_heartbeat_t
-{
- uint8_t type; ///< Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- uint8_t autopilot; ///< Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- uint8_t mavlink_version; ///< MAVLink version
-} mavlink_heartbeat_t;
-
-#define MAVLINK_MSG_ID_HEARTBEAT_LEN 3
-#define MAVLINK_MSG_ID_0_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_HEARTBEAT { \
-	"HEARTBEAT", \
-	3, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_heartbeat_t, type) }, \
-         { "autopilot", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_heartbeat_t, autopilot) }, \
-         { "mavlink_version", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_heartbeat_t, mavlink_version) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a heartbeat message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a heartbeat message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a heartbeat struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param heartbeat C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_heartbeat_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_heartbeat_t* heartbeat)
-{
-	return mavlink_msg_heartbeat_pack(system_id, component_id, msg, heartbeat->type, heartbeat->autopilot);
-}
-
-/**
- * @brief Send a heartbeat message
- * @param chan MAVLink channel to send the message
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_heartbeat_send(mavlink_channel_t chan, uint8_t type, uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE HEARTBEAT UNPACKING
-
-
-/**
- * @brief Get field type from heartbeat message
- *
- * @return Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- */
-static inline uint8_t mavlink_msg_heartbeat_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field autopilot from heartbeat message
- *
- * @return Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- */
-static inline uint8_t mavlink_msg_heartbeat_get_autopilot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field mavlink_version from heartbeat message
- *
- * @return MAVLink version
- */
-static inline uint8_t mavlink_msg_heartbeat_get_mavlink_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a heartbeat message into a struct
- *
- * @param msg The message to decode
- * @param heartbeat C-struct to decode the message contents into
- */
-static inline void mavlink_msg_heartbeat_decode(const mavlink_message_t* msg, mavlink_heartbeat_t* heartbeat)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	heartbeat->type = mavlink_msg_heartbeat_get_type(msg);
-	heartbeat->autopilot = mavlink_msg_heartbeat_get_autopilot(msg);
-	heartbeat->mavlink_version = mavlink_msg_heartbeat_get_mavlink_version(msg);
-#else
-	memcpy(heartbeat, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_controls.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_controls.h
deleted file mode 100644
index 231c6f216..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_controls.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE HIL_CONTROLS PACKING
-
-#define MAVLINK_MSG_ID_HIL_CONTROLS 68
-
-typedef struct __mavlink_hil_controls_t
-{
- uint64_t time_us; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float roll_ailerons; ///< Control output -3 .. 1
- float pitch_elevator; ///< Control output -1 .. 1
- float yaw_rudder; ///< Control output -1 .. 1
- float throttle; ///< Throttle 0 .. 1
- uint8_t mode; ///< System mode (MAV_MODE)
- uint8_t nav_mode; ///< Navigation mode (MAV_NAV_MODE)
-} mavlink_hil_controls_t;
-
-#define MAVLINK_MSG_ID_HIL_CONTROLS_LEN 26
-#define MAVLINK_MSG_ID_68_LEN 26
-
-
-
-#define MAVLINK_MESSAGE_INFO_HIL_CONTROLS { \
-	"HIL_CONTROLS", \
-	7, \
-	{  { "time_us", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_hil_controls_t, time_us) }, \
-         { "roll_ailerons", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_hil_controls_t, roll_ailerons) }, \
-         { "pitch_elevator", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_hil_controls_t, pitch_elevator) }, \
-         { "yaw_rudder", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_hil_controls_t, yaw_rudder) }, \
-         { "throttle", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_hil_controls_t, throttle) }, \
-         { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_hil_controls_t, mode) }, \
-         { "nav_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_hil_controls_t, nav_mode) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a hil_controls message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time_us Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll_ailerons Control output -3 .. 1
- * @param pitch_elevator Control output -1 .. 1
- * @param yaw_rudder Control output -1 .. 1
- * @param throttle Throttle 0 .. 1
- * @param mode System mode (MAV_MODE)
- * @param nav_mode Navigation mode (MAV_NAV_MODE)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hil_controls_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t time_us, float roll_ailerons, float pitch_elevator, float yaw_rudder, float throttle, uint8_t mode, uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_ailerons);
-	_mav_put_float(buf, 12, pitch_elevator);
-	_mav_put_float(buf, 16, yaw_rudder);
-	_mav_put_float(buf, 20, throttle);
-	_mav_put_uint8_t(buf, 24, mode);
-	_mav_put_uint8_t(buf, 25, nav_mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_hil_controls_t packet;
-	packet.time_us = time_us;
-	packet.roll_ailerons = roll_ailerons;
-	packet.pitch_elevator = pitch_elevator;
-	packet.yaw_rudder = yaw_rudder;
-	packet.throttle = throttle;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HIL_CONTROLS;
-	return mavlink_finalize_message(msg, system_id, component_id, 26);
-}
-
-/**
- * @brief Pack a hil_controls message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time_us Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll_ailerons Control output -3 .. 1
- * @param pitch_elevator Control output -1 .. 1
- * @param yaw_rudder Control output -1 .. 1
- * @param throttle Throttle 0 .. 1
- * @param mode System mode (MAV_MODE)
- * @param nav_mode Navigation mode (MAV_NAV_MODE)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hil_controls_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t time_us,float roll_ailerons,float pitch_elevator,float yaw_rudder,float throttle,uint8_t mode,uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_ailerons);
-	_mav_put_float(buf, 12, pitch_elevator);
-	_mav_put_float(buf, 16, yaw_rudder);
-	_mav_put_float(buf, 20, throttle);
-	_mav_put_uint8_t(buf, 24, mode);
-	_mav_put_uint8_t(buf, 25, nav_mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_hil_controls_t packet;
-	packet.time_us = time_us;
-	packet.roll_ailerons = roll_ailerons;
-	packet.pitch_elevator = pitch_elevator;
-	packet.yaw_rudder = yaw_rudder;
-	packet.throttle = throttle;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HIL_CONTROLS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
-}
-
-/**
- * @brief Encode a hil_controls struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param hil_controls C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_hil_controls_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_hil_controls_t* hil_controls)
-{
-	return mavlink_msg_hil_controls_pack(system_id, component_id, msg, hil_controls->time_us, hil_controls->roll_ailerons, hil_controls->pitch_elevator, hil_controls->yaw_rudder, hil_controls->throttle, hil_controls->mode, hil_controls->nav_mode);
-}
-
-/**
- * @brief Send a hil_controls message
- * @param chan MAVLink channel to send the message
- *
- * @param time_us Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll_ailerons Control output -3 .. 1
- * @param pitch_elevator Control output -1 .. 1
- * @param yaw_rudder Control output -1 .. 1
- * @param throttle Throttle 0 .. 1
- * @param mode System mode (MAV_MODE)
- * @param nav_mode Navigation mode (MAV_NAV_MODE)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_hil_controls_send(mavlink_channel_t chan, uint64_t time_us, float roll_ailerons, float pitch_elevator, float yaw_rudder, float throttle, uint8_t mode, uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_ailerons);
-	_mav_put_float(buf, 12, pitch_elevator);
-	_mav_put_float(buf, 16, yaw_rudder);
-	_mav_put_float(buf, 20, throttle);
-	_mav_put_uint8_t(buf, 24, mode);
-	_mav_put_uint8_t(buf, 25, nav_mode);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HIL_CONTROLS, buf, 26);
-#else
-	mavlink_hil_controls_t packet;
-	packet.time_us = time_us;
-	packet.roll_ailerons = roll_ailerons;
-	packet.pitch_elevator = pitch_elevator;
-	packet.yaw_rudder = yaw_rudder;
-	packet.throttle = throttle;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HIL_CONTROLS, (const char *)&packet, 26);
-#endif
-}
-
-#endif
-
-// MESSAGE HIL_CONTROLS UNPACKING
-
-
-/**
- * @brief Get field time_us from hil_controls message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_hil_controls_get_time_us(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field roll_ailerons from hil_controls message
- *
- * @return Control output -3 .. 1
- */
-static inline float mavlink_msg_hil_controls_get_roll_ailerons(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field pitch_elevator from hil_controls message
- *
- * @return Control output -1 .. 1
- */
-static inline float mavlink_msg_hil_controls_get_pitch_elevator(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw_rudder from hil_controls message
- *
- * @return Control output -1 .. 1
- */
-static inline float mavlink_msg_hil_controls_get_yaw_rudder(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field throttle from hil_controls message
- *
- * @return Throttle 0 .. 1
- */
-static inline float mavlink_msg_hil_controls_get_throttle(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field mode from hil_controls message
- *
- * @return System mode (MAV_MODE)
- */
-static inline uint8_t mavlink_msg_hil_controls_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  24);
-}
-
-/**
- * @brief Get field nav_mode from hil_controls message
- *
- * @return Navigation mode (MAV_NAV_MODE)
- */
-static inline uint8_t mavlink_msg_hil_controls_get_nav_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  25);
-}
-
-/**
- * @brief Decode a hil_controls message into a struct
- *
- * @param msg The message to decode
- * @param hil_controls C-struct to decode the message contents into
- */
-static inline void mavlink_msg_hil_controls_decode(const mavlink_message_t* msg, mavlink_hil_controls_t* hil_controls)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	hil_controls->time_us = mavlink_msg_hil_controls_get_time_us(msg);
-	hil_controls->roll_ailerons = mavlink_msg_hil_controls_get_roll_ailerons(msg);
-	hil_controls->pitch_elevator = mavlink_msg_hil_controls_get_pitch_elevator(msg);
-	hil_controls->yaw_rudder = mavlink_msg_hil_controls_get_yaw_rudder(msg);
-	hil_controls->throttle = mavlink_msg_hil_controls_get_throttle(msg);
-	hil_controls->mode = mavlink_msg_hil_controls_get_mode(msg);
-	hil_controls->nav_mode = mavlink_msg_hil_controls_get_nav_mode(msg);
-#else
-	memcpy(hil_controls, _MAV_PAYLOAD(msg), 26);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_state.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_state.h
deleted file mode 100644
index 6692c2258..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_hil_state.h
+++ /dev/null
@@ -1,474 +0,0 @@
-// MESSAGE HIL_STATE PACKING
-
-#define MAVLINK_MSG_ID_HIL_STATE 67
-
-typedef struct __mavlink_hil_state_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float roll; ///< Roll angle (rad)
- float pitch; ///< Pitch angle (rad)
- float yaw; ///< Yaw angle (rad)
- float rollspeed; ///< Roll angular speed (rad/s)
- float pitchspeed; ///< Pitch angular speed (rad/s)
- float yawspeed; ///< Yaw angular speed (rad/s)
- int32_t lat; ///< Latitude, expressed as * 1E7
- int32_t lon; ///< Longitude, expressed as * 1E7
- int32_t alt; ///< Altitude in meters, expressed as * 1000 (millimeters)
- int16_t vx; ///< Ground X Speed (Latitude), expressed as m/s * 100
- int16_t vy; ///< Ground Y Speed (Longitude), expressed as m/s * 100
- int16_t vz; ///< Ground Z Speed (Altitude), expressed as m/s * 100
- int16_t xacc; ///< X acceleration (mg)
- int16_t yacc; ///< Y acceleration (mg)
- int16_t zacc; ///< Z acceleration (mg)
-} mavlink_hil_state_t;
-
-#define MAVLINK_MSG_ID_HIL_STATE_LEN 56
-#define MAVLINK_MSG_ID_67_LEN 56
-
-
-
-#define MAVLINK_MESSAGE_INFO_HIL_STATE { \
-	"HIL_STATE", \
-	16, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_hil_state_t, usec) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_hil_state_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_hil_state_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_hil_state_t, yaw) }, \
-         { "rollspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_hil_state_t, rollspeed) }, \
-         { "pitchspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_hil_state_t, pitchspeed) }, \
-         { "yawspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_hil_state_t, yawspeed) }, \
-         { "lat", NULL, MAVLINK_TYPE_INT32_T, 0, 32, offsetof(mavlink_hil_state_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_INT32_T, 0, 36, offsetof(mavlink_hil_state_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_INT32_T, 0, 40, offsetof(mavlink_hil_state_t, alt) }, \
-         { "vx", NULL, MAVLINK_TYPE_INT16_T, 0, 44, offsetof(mavlink_hil_state_t, vx) }, \
-         { "vy", NULL, MAVLINK_TYPE_INT16_T, 0, 46, offsetof(mavlink_hil_state_t, vy) }, \
-         { "vz", NULL, MAVLINK_TYPE_INT16_T, 0, 48, offsetof(mavlink_hil_state_t, vz) }, \
-         { "xacc", NULL, MAVLINK_TYPE_INT16_T, 0, 50, offsetof(mavlink_hil_state_t, xacc) }, \
-         { "yacc", NULL, MAVLINK_TYPE_INT16_T, 0, 52, offsetof(mavlink_hil_state_t, yacc) }, \
-         { "zacc", NULL, MAVLINK_TYPE_INT16_T, 0, 54, offsetof(mavlink_hil_state_t, zacc) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a hil_state message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hil_state_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float roll, float pitch, float yaw, float rollspeed, float pitchspeed, float yawspeed, int32_t lat, int32_t lon, int32_t alt, int16_t vx, int16_t vy, int16_t vz, int16_t xacc, int16_t yacc, int16_t zacc)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[56];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-	_mav_put_int32_t(buf, 32, lat);
-	_mav_put_int32_t(buf, 36, lon);
-	_mav_put_int32_t(buf, 40, alt);
-	_mav_put_int16_t(buf, 44, vx);
-	_mav_put_int16_t(buf, 46, vy);
-	_mav_put_int16_t(buf, 48, vz);
-	_mav_put_int16_t(buf, 50, xacc);
-	_mav_put_int16_t(buf, 52, yacc);
-	_mav_put_int16_t(buf, 54, zacc);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 56);
-#else
-	mavlink_hil_state_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 56);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HIL_STATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 56);
-}
-
-/**
- * @brief Pack a hil_state message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_hil_state_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float roll,float pitch,float yaw,float rollspeed,float pitchspeed,float yawspeed,int32_t lat,int32_t lon,int32_t alt,int16_t vx,int16_t vy,int16_t vz,int16_t xacc,int16_t yacc,int16_t zacc)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[56];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-	_mav_put_int32_t(buf, 32, lat);
-	_mav_put_int32_t(buf, 36, lon);
-	_mav_put_int32_t(buf, 40, alt);
-	_mav_put_int16_t(buf, 44, vx);
-	_mav_put_int16_t(buf, 46, vy);
-	_mav_put_int16_t(buf, 48, vz);
-	_mav_put_int16_t(buf, 50, xacc);
-	_mav_put_int16_t(buf, 52, yacc);
-	_mav_put_int16_t(buf, 54, zacc);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 56);
-#else
-	mavlink_hil_state_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 56);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HIL_STATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 56);
-}
-
-/**
- * @brief Encode a hil_state struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param hil_state C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_hil_state_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_hil_state_t* hil_state)
-{
-	return mavlink_msg_hil_state_pack(system_id, component_id, msg, hil_state->usec, hil_state->roll, hil_state->pitch, hil_state->yaw, hil_state->rollspeed, hil_state->pitchspeed, hil_state->yawspeed, hil_state->lat, hil_state->lon, hil_state->alt, hil_state->vx, hil_state->vy, hil_state->vz, hil_state->xacc, hil_state->yacc, hil_state->zacc);
-}
-
-/**
- * @brief Send a hil_state message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @param rollspeed Roll angular speed (rad/s)
- * @param pitchspeed Pitch angular speed (rad/s)
- * @param yawspeed Yaw angular speed (rad/s)
- * @param lat Latitude, expressed as * 1E7
- * @param lon Longitude, expressed as * 1E7
- * @param alt Altitude in meters, expressed as * 1000 (millimeters)
- * @param vx Ground X Speed (Latitude), expressed as m/s * 100
- * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
- * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_hil_state_send(mavlink_channel_t chan, uint64_t usec, float roll, float pitch, float yaw, float rollspeed, float pitchspeed, float yawspeed, int32_t lat, int32_t lon, int32_t alt, int16_t vx, int16_t vy, int16_t vz, int16_t xacc, int16_t yacc, int16_t zacc)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[56];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, rollspeed);
-	_mav_put_float(buf, 24, pitchspeed);
-	_mav_put_float(buf, 28, yawspeed);
-	_mav_put_int32_t(buf, 32, lat);
-	_mav_put_int32_t(buf, 36, lon);
-	_mav_put_int32_t(buf, 40, alt);
-	_mav_put_int16_t(buf, 44, vx);
-	_mav_put_int16_t(buf, 46, vy);
-	_mav_put_int16_t(buf, 48, vz);
-	_mav_put_int16_t(buf, 50, xacc);
-	_mav_put_int16_t(buf, 52, yacc);
-	_mav_put_int16_t(buf, 54, zacc);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HIL_STATE, buf, 56);
-#else
-	mavlink_hil_state_t packet;
-	packet.usec = usec;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.rollspeed = rollspeed;
-	packet.pitchspeed = pitchspeed;
-	packet.yawspeed = yawspeed;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HIL_STATE, (const char *)&packet, 56);
-#endif
-}
-
-#endif
-
-// MESSAGE HIL_STATE UNPACKING
-
-
-/**
- * @brief Get field usec from hil_state message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_hil_state_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field roll from hil_state message
- *
- * @return Roll angle (rad)
- */
-static inline float mavlink_msg_hil_state_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field pitch from hil_state message
- *
- * @return Pitch angle (rad)
- */
-static inline float mavlink_msg_hil_state_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw from hil_state message
- *
- * @return Yaw angle (rad)
- */
-static inline float mavlink_msg_hil_state_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field rollspeed from hil_state message
- *
- * @return Roll angular speed (rad/s)
- */
-static inline float mavlink_msg_hil_state_get_rollspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field pitchspeed from hil_state message
- *
- * @return Pitch angular speed (rad/s)
- */
-static inline float mavlink_msg_hil_state_get_pitchspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field yawspeed from hil_state message
- *
- * @return Yaw angular speed (rad/s)
- */
-static inline float mavlink_msg_hil_state_get_yawspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field lat from hil_state message
- *
- * @return Latitude, expressed as * 1E7
- */
-static inline int32_t mavlink_msg_hil_state_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  32);
-}
-
-/**
- * @brief Get field lon from hil_state message
- *
- * @return Longitude, expressed as * 1E7
- */
-static inline int32_t mavlink_msg_hil_state_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  36);
-}
-
-/**
- * @brief Get field alt from hil_state message
- *
- * @return Altitude in meters, expressed as * 1000 (millimeters)
- */
-static inline int32_t mavlink_msg_hil_state_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  40);
-}
-
-/**
- * @brief Get field vx from hil_state message
- *
- * @return Ground X Speed (Latitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_hil_state_get_vx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  44);
-}
-
-/**
- * @brief Get field vy from hil_state message
- *
- * @return Ground Y Speed (Longitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_hil_state_get_vy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  46);
-}
-
-/**
- * @brief Get field vz from hil_state message
- *
- * @return Ground Z Speed (Altitude), expressed as m/s * 100
- */
-static inline int16_t mavlink_msg_hil_state_get_vz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  48);
-}
-
-/**
- * @brief Get field xacc from hil_state message
- *
- * @return X acceleration (mg)
- */
-static inline int16_t mavlink_msg_hil_state_get_xacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  50);
-}
-
-/**
- * @brief Get field yacc from hil_state message
- *
- * @return Y acceleration (mg)
- */
-static inline int16_t mavlink_msg_hil_state_get_yacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  52);
-}
-
-/**
- * @brief Get field zacc from hil_state message
- *
- * @return Z acceleration (mg)
- */
-static inline int16_t mavlink_msg_hil_state_get_zacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  54);
-}
-
-/**
- * @brief Decode a hil_state message into a struct
- *
- * @param msg The message to decode
- * @param hil_state C-struct to decode the message contents into
- */
-static inline void mavlink_msg_hil_state_decode(const mavlink_message_t* msg, mavlink_hil_state_t* hil_state)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	hil_state->usec = mavlink_msg_hil_state_get_usec(msg);
-	hil_state->roll = mavlink_msg_hil_state_get_roll(msg);
-	hil_state->pitch = mavlink_msg_hil_state_get_pitch(msg);
-	hil_state->yaw = mavlink_msg_hil_state_get_yaw(msg);
-	hil_state->rollspeed = mavlink_msg_hil_state_get_rollspeed(msg);
-	hil_state->pitchspeed = mavlink_msg_hil_state_get_pitchspeed(msg);
-	hil_state->yawspeed = mavlink_msg_hil_state_get_yawspeed(msg);
-	hil_state->lat = mavlink_msg_hil_state_get_lat(msg);
-	hil_state->lon = mavlink_msg_hil_state_get_lon(msg);
-	hil_state->alt = mavlink_msg_hil_state_get_alt(msg);
-	hil_state->vx = mavlink_msg_hil_state_get_vx(msg);
-	hil_state->vy = mavlink_msg_hil_state_get_vy(msg);
-	hil_state->vz = mavlink_msg_hil_state_get_vz(msg);
-	hil_state->xacc = mavlink_msg_hil_state_get_xacc(msg);
-	hil_state->yacc = mavlink_msg_hil_state_get_yacc(msg);
-	hil_state->zacc = mavlink_msg_hil_state_get_zacc(msg);
-#else
-	memcpy(hil_state, _MAV_PAYLOAD(msg), 56);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position.h
deleted file mode 100644
index 121fb3af6..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE LOCAL_POSITION PACKING
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION 31
-
-typedef struct __mavlink_local_position_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float x; ///< X Position
- float y; ///< Y Position
- float z; ///< Z Position
- float vx; ///< X Speed
- float vy; ///< Y Speed
- float vz; ///< Z Speed
-} mavlink_local_position_t;
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION_LEN 32
-#define MAVLINK_MSG_ID_31_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_LOCAL_POSITION { \
-	"LOCAL_POSITION", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_local_position_t, usec) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_local_position_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_local_position_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_local_position_t, z) }, \
-         { "vx", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_local_position_t, vx) }, \
-         { "vy", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_local_position_t, vy) }, \
-         { "vz", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_local_position_t, vz) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a local_position message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param vx X Speed
- * @param vy Y Speed
- * @param vz Z Speed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float x, float y, float z, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_local_position_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a local_position message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param vx X Speed
- * @param vy Y Speed
- * @param vz Z Speed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float x,float y,float z,float vx,float vy,float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_local_position_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a local_position struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param local_position C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_local_position_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_local_position_t* local_position)
-{
-	return mavlink_msg_local_position_pack(system_id, component_id, msg, local_position->usec, local_position->x, local_position->y, local_position->z, local_position->vx, local_position->vy, local_position->vz);
-}
-
-/**
- * @brief Send a local_position message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param vx X Speed
- * @param vy Y Speed
- * @param vz Z Speed
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_local_position_send(mavlink_channel_t chan, uint64_t usec, float x, float y, float z, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION, buf, 32);
-#else
-	mavlink_local_position_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE LOCAL_POSITION UNPACKING
-
-
-/**
- * @brief Get field usec from local_position message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_local_position_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field x from local_position message
- *
- * @return X Position
- */
-static inline float mavlink_msg_local_position_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field y from local_position message
- *
- * @return Y Position
- */
-static inline float mavlink_msg_local_position_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field z from local_position message
- *
- * @return Z Position
- */
-static inline float mavlink_msg_local_position_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field vx from local_position message
- *
- * @return X Speed
- */
-static inline float mavlink_msg_local_position_get_vx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field vy from local_position message
- *
- * @return Y Speed
- */
-static inline float mavlink_msg_local_position_get_vy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field vz from local_position message
- *
- * @return Z Speed
- */
-static inline float mavlink_msg_local_position_get_vz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a local_position message into a struct
- *
- * @param msg The message to decode
- * @param local_position C-struct to decode the message contents into
- */
-static inline void mavlink_msg_local_position_decode(const mavlink_message_t* msg, mavlink_local_position_t* local_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	local_position->usec = mavlink_msg_local_position_get_usec(msg);
-	local_position->x = mavlink_msg_local_position_get_x(msg);
-	local_position->y = mavlink_msg_local_position_get_y(msg);
-	local_position->z = mavlink_msg_local_position_get_z(msg);
-	local_position->vx = mavlink_msg_local_position_get_vx(msg);
-	local_position->vy = mavlink_msg_local_position_get_vy(msg);
-	local_position->vz = mavlink_msg_local_position_get_vz(msg);
-#else
-	memcpy(local_position, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint.h
deleted file mode 100644
index 2e6178d96..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE LOCAL_POSITION_SETPOINT PACKING
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT 51
-
-typedef struct __mavlink_local_position_setpoint_t
-{
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float yaw; ///< Desired yaw angle
-} mavlink_local_position_setpoint_t;
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_LEN 16
-#define MAVLINK_MSG_ID_51_LEN 16
-
-
-
-#define MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT { \
-	"LOCAL_POSITION_SETPOINT", \
-	4, \
-	{  { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_local_position_setpoint_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_local_position_setpoint_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_local_position_setpoint_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_local_position_setpoint_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a local_position_setpoint message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_local_position_setpoint_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 16);
-}
-
-/**
- * @brief Pack a local_position_setpoint message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_local_position_setpoint_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
-}
-
-/**
- * @brief Encode a local_position_setpoint struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param local_position_setpoint C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_local_position_setpoint_t* local_position_setpoint)
-{
-	return mavlink_msg_local_position_setpoint_pack(system_id, component_id, msg, local_position_setpoint->x, local_position_setpoint->y, local_position_setpoint->z, local_position_setpoint->yaw);
-}
-
-/**
- * @brief Send a local_position_setpoint message
- * @param chan MAVLink channel to send the message
- *
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_local_position_setpoint_send(mavlink_channel_t chan, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT, buf, 16);
-#else
-	mavlink_local_position_setpoint_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT, (const char *)&packet, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE LOCAL_POSITION_SETPOINT UNPACKING
-
-
-/**
- * @brief Get field x from local_position_setpoint message
- *
- * @return x position
- */
-static inline float mavlink_msg_local_position_setpoint_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field y from local_position_setpoint message
- *
- * @return y position
- */
-static inline float mavlink_msg_local_position_setpoint_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field z from local_position_setpoint message
- *
- * @return z position
- */
-static inline float mavlink_msg_local_position_setpoint_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field yaw from local_position_setpoint message
- *
- * @return Desired yaw angle
- */
-static inline float mavlink_msg_local_position_setpoint_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Decode a local_position_setpoint message into a struct
- *
- * @param msg The message to decode
- * @param local_position_setpoint C-struct to decode the message contents into
- */
-static inline void mavlink_msg_local_position_setpoint_decode(const mavlink_message_t* msg, mavlink_local_position_setpoint_t* local_position_setpoint)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	local_position_setpoint->x = mavlink_msg_local_position_setpoint_get_x(msg);
-	local_position_setpoint->y = mavlink_msg_local_position_setpoint_get_y(msg);
-	local_position_setpoint->z = mavlink_msg_local_position_setpoint_get_z(msg);
-	local_position_setpoint->yaw = mavlink_msg_local_position_setpoint_get_yaw(msg);
-#else
-	memcpy(local_position_setpoint, _MAV_PAYLOAD(msg), 16);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint_set.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint_set.h
deleted file mode 100644
index e676c2832..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint_set.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE LOCAL_POSITION_SETPOINT_SET PACKING
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET 50
-
-typedef struct __mavlink_local_position_setpoint_set_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float yaw; ///< Desired yaw angle
-} mavlink_local_position_setpoint_set_t;
-
-#define MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET_LEN 18
-#define MAVLINK_MSG_ID_50_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET { \
-	"LOCAL_POSITION_SETPOINT_SET", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_local_position_setpoint_set_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_local_position_setpoint_set_t, target_component) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_local_position_setpoint_set_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_local_position_setpoint_set_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_local_position_setpoint_set_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_local_position_setpoint_set_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a local_position_setpoint_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_local_position_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a local_position_setpoint_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_local_position_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a local_position_setpoint_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param local_position_setpoint_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_local_position_setpoint_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_local_position_setpoint_set_t* local_position_setpoint_set)
-{
-	return mavlink_msg_local_position_setpoint_set_pack(system_id, component_id, msg, local_position_setpoint_set->target_system, local_position_setpoint_set->target_component, local_position_setpoint_set->x, local_position_setpoint_set->y, local_position_setpoint_set->z, local_position_setpoint_set->yaw);
-}
-
-/**
- * @brief Send a local_position_setpoint_set message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw Desired yaw angle
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_local_position_setpoint_set_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET, buf, 18);
-#else
-	mavlink_local_position_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LOCAL_POSITION_SETPOINT_SET, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE LOCAL_POSITION_SETPOINT_SET UNPACKING
-
-
-/**
- * @brief Get field target_system from local_position_setpoint_set message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_local_position_setpoint_set_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from local_position_setpoint_set message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_local_position_setpoint_set_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field x from local_position_setpoint_set message
- *
- * @return x position
- */
-static inline float mavlink_msg_local_position_setpoint_set_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field y from local_position_setpoint_set message
- *
- * @return y position
- */
-static inline float mavlink_msg_local_position_setpoint_set_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field z from local_position_setpoint_set message
- *
- * @return z position
- */
-static inline float mavlink_msg_local_position_setpoint_set_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field yaw from local_position_setpoint_set message
- *
- * @return Desired yaw angle
- */
-static inline float mavlink_msg_local_position_setpoint_set_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a local_position_setpoint_set message into a struct
- *
- * @param msg The message to decode
- * @param local_position_setpoint_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_local_position_setpoint_set_decode(const mavlink_message_t* msg, mavlink_local_position_setpoint_set_t* local_position_setpoint_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	local_position_setpoint_set->target_system = mavlink_msg_local_position_setpoint_set_get_target_system(msg);
-	local_position_setpoint_set->target_component = mavlink_msg_local_position_setpoint_set_get_target_component(msg);
-	local_position_setpoint_set->x = mavlink_msg_local_position_setpoint_set_get_x(msg);
-	local_position_setpoint_set->y = mavlink_msg_local_position_setpoint_set_get_y(msg);
-	local_position_setpoint_set->z = mavlink_msg_local_position_setpoint_set_get_z(msg);
-	local_position_setpoint_set->yaw = mavlink_msg_local_position_setpoint_set_get_yaw(msg);
-#else
-	memcpy(local_position_setpoint_set, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_manual_control.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_manual_control.h
deleted file mode 100644
index 26b70ce4a..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_manual_control.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE MANUAL_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_MANUAL_CONTROL 69
-
-typedef struct __mavlink_manual_control_t
-{
- uint8_t target; ///< The system to be controlled
- float roll; ///< roll
- float pitch; ///< pitch
- float yaw; ///< yaw
- float thrust; ///< thrust
- uint8_t roll_manual; ///< roll control enabled auto:0, manual:1
- uint8_t pitch_manual; ///< pitch auto:0, manual:1
- uint8_t yaw_manual; ///< yaw auto:0, manual:1
- uint8_t thrust_manual; ///< thrust auto:0, manual:1
-} mavlink_manual_control_t;
-
-#define MAVLINK_MSG_ID_MANUAL_CONTROL_LEN 21
-#define MAVLINK_MSG_ID_69_LEN 21
-
-
-
-#define MAVLINK_MESSAGE_INFO_MANUAL_CONTROL { \
-	"MANUAL_CONTROL", \
-	9, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_manual_control_t, target) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_manual_control_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_manual_control_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_manual_control_t, yaw) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_manual_control_t, thrust) }, \
-         { "roll_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_manual_control_t, roll_manual) }, \
-         { "pitch_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_manual_control_t, pitch_manual) }, \
-         { "yaw_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 19, offsetof(mavlink_manual_control_t, yaw_manual) }, \
-         { "thrust_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_manual_control_t, thrust_manual) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a manual_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_manual_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, float roll, float pitch, float yaw, float thrust, uint8_t roll_manual, uint8_t pitch_manual, uint8_t yaw_manual, uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_manual_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MANUAL_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 21);
-}
-
-/**
- * @brief Pack a manual_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_manual_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,float roll,float pitch,float yaw,float thrust,uint8_t roll_manual,uint8_t pitch_manual,uint8_t yaw_manual,uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_manual_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MANUAL_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 21);
-}
-
-/**
- * @brief Encode a manual_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param manual_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_manual_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_manual_control_t* manual_control)
-{
-	return mavlink_msg_manual_control_pack(system_id, component_id, msg, manual_control->target, manual_control->roll, manual_control->pitch, manual_control->yaw, manual_control->thrust, manual_control->roll_manual, manual_control->pitch_manual, manual_control->yaw_manual, manual_control->thrust_manual);
-}
-
-/**
- * @brief Send a manual_control message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_manual_control_send(mavlink_channel_t chan, uint8_t target, float roll, float pitch, float yaw, float thrust, uint8_t roll_manual, uint8_t pitch_manual, uint8_t yaw_manual, uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MANUAL_CONTROL, buf, 21);
-#else
-	mavlink_manual_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MANUAL_CONTROL, (const char *)&packet, 21);
-#endif
-}
-
-#endif
-
-// MESSAGE MANUAL_CONTROL UNPACKING
-
-
-/**
- * @brief Get field target from manual_control message
- *
- * @return The system to be controlled
- */
-static inline uint8_t mavlink_msg_manual_control_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field roll from manual_control message
- *
- * @return roll
- */
-static inline float mavlink_msg_manual_control_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Get field pitch from manual_control message
- *
- * @return pitch
- */
-static inline float mavlink_msg_manual_control_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field yaw from manual_control message
- *
- * @return yaw
- */
-static inline float mavlink_msg_manual_control_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field thrust from manual_control message
- *
- * @return thrust
- */
-static inline float mavlink_msg_manual_control_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field roll_manual from manual_control message
- *
- * @return roll control enabled auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_manual_control_get_roll_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  17);
-}
-
-/**
- * @brief Get field pitch_manual from manual_control message
- *
- * @return pitch auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_manual_control_get_pitch_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  18);
-}
-
-/**
- * @brief Get field yaw_manual from manual_control message
- *
- * @return yaw auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_manual_control_get_yaw_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  19);
-}
-
-/**
- * @brief Get field thrust_manual from manual_control message
- *
- * @return thrust auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_manual_control_get_thrust_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  20);
-}
-
-/**
- * @brief Decode a manual_control message into a struct
- *
- * @param msg The message to decode
- * @param manual_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_manual_control_decode(const mavlink_message_t* msg, mavlink_manual_control_t* manual_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	manual_control->target = mavlink_msg_manual_control_get_target(msg);
-	manual_control->roll = mavlink_msg_manual_control_get_roll(msg);
-	manual_control->pitch = mavlink_msg_manual_control_get_pitch(msg);
-	manual_control->yaw = mavlink_msg_manual_control_get_yaw(msg);
-	manual_control->thrust = mavlink_msg_manual_control_get_thrust(msg);
-	manual_control->roll_manual = mavlink_msg_manual_control_get_roll_manual(msg);
-	manual_control->pitch_manual = mavlink_msg_manual_control_get_pitch_manual(msg);
-	manual_control->yaw_manual = mavlink_msg_manual_control_get_yaw_manual(msg);
-	manual_control->thrust_manual = mavlink_msg_manual_control_get_thrust_manual(msg);
-#else
-	memcpy(manual_control, _MAV_PAYLOAD(msg), 21);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_float.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_float.h
deleted file mode 100644
index 5cf76e372..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_float.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// MESSAGE NAMED_VALUE_FLOAT PACKING
-
-#define MAVLINK_MSG_ID_NAMED_VALUE_FLOAT 252
-
-typedef struct __mavlink_named_value_float_t
-{
- char name[10]; ///< Name of the debug variable
- float value; ///< Floating point value
-} mavlink_named_value_float_t;
-
-#define MAVLINK_MSG_ID_NAMED_VALUE_FLOAT_LEN 14
-#define MAVLINK_MSG_ID_252_LEN 14
-
-#define MAVLINK_MSG_NAMED_VALUE_FLOAT_FIELD_NAME_LEN 10
-
-#define MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT { \
-	"NAMED_VALUE_FLOAT", \
-	2, \
-	{  { "name", NULL, MAVLINK_TYPE_CHAR, 10, 0, offsetof(mavlink_named_value_float_t, name) }, \
-         { "value", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_named_value_float_t, value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a named_value_float message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param name Name of the debug variable
- * @param value Floating point value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_named_value_float_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const char *name, float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_float(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_named_value_float_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT;
-	return mavlink_finalize_message(msg, system_id, component_id, 14);
-}
-
-/**
- * @brief Pack a named_value_float message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param name Name of the debug variable
- * @param value Floating point value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_named_value_float_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const char *name,float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_float(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_named_value_float_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14);
-}
-
-/**
- * @brief Encode a named_value_float struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param named_value_float C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_named_value_float_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_named_value_float_t* named_value_float)
-{
-	return mavlink_msg_named_value_float_pack(system_id, component_id, msg, named_value_float->name, named_value_float->value);
-}
-
-/**
- * @brief Send a named_value_float message
- * @param chan MAVLink channel to send the message
- *
- * @param name Name of the debug variable
- * @param value Floating point value
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_named_value_float_send(mavlink_channel_t chan, const char *name, float value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_float(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAMED_VALUE_FLOAT, buf, 14);
-#else
-	mavlink_named_value_float_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAMED_VALUE_FLOAT, (const char *)&packet, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE NAMED_VALUE_FLOAT UNPACKING
-
-
-/**
- * @brief Get field name from named_value_float message
- *
- * @return Name of the debug variable
- */
-static inline uint16_t mavlink_msg_named_value_float_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 10,  0);
-}
-
-/**
- * @brief Get field value from named_value_float message
- *
- * @return Floating point value
- */
-static inline float mavlink_msg_named_value_float_get_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Decode a named_value_float message into a struct
- *
- * @param msg The message to decode
- * @param named_value_float C-struct to decode the message contents into
- */
-static inline void mavlink_msg_named_value_float_decode(const mavlink_message_t* msg, mavlink_named_value_float_t* named_value_float)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_named_value_float_get_name(msg, named_value_float->name);
-	named_value_float->value = mavlink_msg_named_value_float_get_value(msg);
-#else
-	memcpy(named_value_float, _MAV_PAYLOAD(msg), 14);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_int.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_int.h
deleted file mode 100644
index 93f0911aa..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_named_value_int.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// MESSAGE NAMED_VALUE_INT PACKING
-
-#define MAVLINK_MSG_ID_NAMED_VALUE_INT 253
-
-typedef struct __mavlink_named_value_int_t
-{
- char name[10]; ///< Name of the debug variable
- int32_t value; ///< Signed integer value
-} mavlink_named_value_int_t;
-
-#define MAVLINK_MSG_ID_NAMED_VALUE_INT_LEN 14
-#define MAVLINK_MSG_ID_253_LEN 14
-
-#define MAVLINK_MSG_NAMED_VALUE_INT_FIELD_NAME_LEN 10
-
-#define MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT { \
-	"NAMED_VALUE_INT", \
-	2, \
-	{  { "name", NULL, MAVLINK_TYPE_CHAR, 10, 0, offsetof(mavlink_named_value_int_t, name) }, \
-         { "value", NULL, MAVLINK_TYPE_INT32_T, 0, 10, offsetof(mavlink_named_value_int_t, value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a named_value_int message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param name Name of the debug variable
- * @param value Signed integer value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_named_value_int_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const char *name, int32_t value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_named_value_int_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAMED_VALUE_INT;
-	return mavlink_finalize_message(msg, system_id, component_id, 14);
-}
-
-/**
- * @brief Pack a named_value_int message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param name Name of the debug variable
- * @param value Signed integer value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_named_value_int_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const char *name,int32_t value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_named_value_int_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAMED_VALUE_INT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14);
-}
-
-/**
- * @brief Encode a named_value_int struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param named_value_int C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_named_value_int_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_named_value_int_t* named_value_int)
-{
-	return mavlink_msg_named_value_int_pack(system_id, component_id, msg, named_value_int->name, named_value_int->value);
-}
-
-/**
- * @brief Send a named_value_int message
- * @param chan MAVLink channel to send the message
- *
- * @param name Name of the debug variable
- * @param value Signed integer value
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_named_value_int_send(mavlink_channel_t chan, const char *name, int32_t value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 10, value);
-	_mav_put_char_array(buf, 0, name, 10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAMED_VALUE_INT, buf, 14);
-#else
-	mavlink_named_value_int_t packet;
-	packet.value = value;
-	mav_array_memcpy(packet.name, name, sizeof(char)*10);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAMED_VALUE_INT, (const char *)&packet, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE NAMED_VALUE_INT UNPACKING
-
-
-/**
- * @brief Get field name from named_value_int message
- *
- * @return Name of the debug variable
- */
-static inline uint16_t mavlink_msg_named_value_int_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 10,  0);
-}
-
-/**
- * @brief Get field value from named_value_int message
- *
- * @return Signed integer value
- */
-static inline int32_t mavlink_msg_named_value_int_get_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  10);
-}
-
-/**
- * @brief Decode a named_value_int message into a struct
- *
- * @param msg The message to decode
- * @param named_value_int C-struct to decode the message contents into
- */
-static inline void mavlink_msg_named_value_int_decode(const mavlink_message_t* msg, mavlink_named_value_int_t* named_value_int)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_named_value_int_get_name(msg, named_value_int->name);
-	named_value_int->value = mavlink_msg_named_value_int_get_value(msg);
-#else
-	memcpy(named_value_int, _MAV_PAYLOAD(msg), 14);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_nav_controller_output.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_nav_controller_output.h
deleted file mode 100644
index 64a4a7fb4..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_nav_controller_output.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// MESSAGE NAV_CONTROLLER_OUTPUT PACKING
-
-#define MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT 62
-
-typedef struct __mavlink_nav_controller_output_t
-{
- float nav_roll; ///< Current desired roll in degrees
- float nav_pitch; ///< Current desired pitch in degrees
- int16_t nav_bearing; ///< Current desired heading in degrees
- int16_t target_bearing; ///< Bearing to current waypoint/target in degrees
- uint16_t wp_dist; ///< Distance to active waypoint in meters
- float alt_error; ///< Current altitude error in meters
- float aspd_error; ///< Current airspeed error in meters/second
- float xtrack_error; ///< Current crosstrack error on x-y plane in meters
-} mavlink_nav_controller_output_t;
-
-#define MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT_LEN 26
-#define MAVLINK_MSG_ID_62_LEN 26
-
-
-
-#define MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT { \
-	"NAV_CONTROLLER_OUTPUT", \
-	8, \
-	{  { "nav_roll", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_nav_controller_output_t, nav_roll) }, \
-         { "nav_pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_nav_controller_output_t, nav_pitch) }, \
-         { "nav_bearing", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_nav_controller_output_t, nav_bearing) }, \
-         { "target_bearing", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_nav_controller_output_t, target_bearing) }, \
-         { "wp_dist", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_nav_controller_output_t, wp_dist) }, \
-         { "alt_error", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_nav_controller_output_t, alt_error) }, \
-         { "aspd_error", NULL, MAVLINK_TYPE_FLOAT, 0, 18, offsetof(mavlink_nav_controller_output_t, aspd_error) }, \
-         { "xtrack_error", NULL, MAVLINK_TYPE_FLOAT, 0, 22, offsetof(mavlink_nav_controller_output_t, xtrack_error) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a nav_controller_output message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param nav_roll Current desired roll in degrees
- * @param nav_pitch Current desired pitch in degrees
- * @param nav_bearing Current desired heading in degrees
- * @param target_bearing Bearing to current waypoint/target in degrees
- * @param wp_dist Distance to active waypoint in meters
- * @param alt_error Current altitude error in meters
- * @param aspd_error Current airspeed error in meters/second
- * @param xtrack_error Current crosstrack error on x-y plane in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_controller_output_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float nav_roll, float nav_pitch, int16_t nav_bearing, int16_t target_bearing, uint16_t wp_dist, float alt_error, float aspd_error, float xtrack_error)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_float(buf, 0, nav_roll);
-	_mav_put_float(buf, 4, nav_pitch);
-	_mav_put_int16_t(buf, 8, nav_bearing);
-	_mav_put_int16_t(buf, 10, target_bearing);
-	_mav_put_uint16_t(buf, 12, wp_dist);
-	_mav_put_float(buf, 14, alt_error);
-	_mav_put_float(buf, 18, aspd_error);
-	_mav_put_float(buf, 22, xtrack_error);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_nav_controller_output_t packet;
-	packet.nav_roll = nav_roll;
-	packet.nav_pitch = nav_pitch;
-	packet.nav_bearing = nav_bearing;
-	packet.target_bearing = target_bearing;
-	packet.wp_dist = wp_dist;
-	packet.alt_error = alt_error;
-	packet.aspd_error = aspd_error;
-	packet.xtrack_error = xtrack_error;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT;
-	return mavlink_finalize_message(msg, system_id, component_id, 26);
-}
-
-/**
- * @brief Pack a nav_controller_output message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param nav_roll Current desired roll in degrees
- * @param nav_pitch Current desired pitch in degrees
- * @param nav_bearing Current desired heading in degrees
- * @param target_bearing Bearing to current waypoint/target in degrees
- * @param wp_dist Distance to active waypoint in meters
- * @param alt_error Current altitude error in meters
- * @param aspd_error Current airspeed error in meters/second
- * @param xtrack_error Current crosstrack error on x-y plane in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_controller_output_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float nav_roll,float nav_pitch,int16_t nav_bearing,int16_t target_bearing,uint16_t wp_dist,float alt_error,float aspd_error,float xtrack_error)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_float(buf, 0, nav_roll);
-	_mav_put_float(buf, 4, nav_pitch);
-	_mav_put_int16_t(buf, 8, nav_bearing);
-	_mav_put_int16_t(buf, 10, target_bearing);
-	_mav_put_uint16_t(buf, 12, wp_dist);
-	_mav_put_float(buf, 14, alt_error);
-	_mav_put_float(buf, 18, aspd_error);
-	_mav_put_float(buf, 22, xtrack_error);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_nav_controller_output_t packet;
-	packet.nav_roll = nav_roll;
-	packet.nav_pitch = nav_pitch;
-	packet.nav_bearing = nav_bearing;
-	packet.target_bearing = target_bearing;
-	packet.wp_dist = wp_dist;
-	packet.alt_error = alt_error;
-	packet.aspd_error = aspd_error;
-	packet.xtrack_error = xtrack_error;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
-}
-
-/**
- * @brief Encode a nav_controller_output struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param nav_controller_output C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_nav_controller_output_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_nav_controller_output_t* nav_controller_output)
-{
-	return mavlink_msg_nav_controller_output_pack(system_id, component_id, msg, nav_controller_output->nav_roll, nav_controller_output->nav_pitch, nav_controller_output->nav_bearing, nav_controller_output->target_bearing, nav_controller_output->wp_dist, nav_controller_output->alt_error, nav_controller_output->aspd_error, nav_controller_output->xtrack_error);
-}
-
-/**
- * @brief Send a nav_controller_output message
- * @param chan MAVLink channel to send the message
- *
- * @param nav_roll Current desired roll in degrees
- * @param nav_pitch Current desired pitch in degrees
- * @param nav_bearing Current desired heading in degrees
- * @param target_bearing Bearing to current waypoint/target in degrees
- * @param wp_dist Distance to active waypoint in meters
- * @param alt_error Current altitude error in meters
- * @param aspd_error Current airspeed error in meters/second
- * @param xtrack_error Current crosstrack error on x-y plane in meters
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_nav_controller_output_send(mavlink_channel_t chan, float nav_roll, float nav_pitch, int16_t nav_bearing, int16_t target_bearing, uint16_t wp_dist, float alt_error, float aspd_error, float xtrack_error)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_float(buf, 0, nav_roll);
-	_mav_put_float(buf, 4, nav_pitch);
-	_mav_put_int16_t(buf, 8, nav_bearing);
-	_mav_put_int16_t(buf, 10, target_bearing);
-	_mav_put_uint16_t(buf, 12, wp_dist);
-	_mav_put_float(buf, 14, alt_error);
-	_mav_put_float(buf, 18, aspd_error);
-	_mav_put_float(buf, 22, xtrack_error);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT, buf, 26);
-#else
-	mavlink_nav_controller_output_t packet;
-	packet.nav_roll = nav_roll;
-	packet.nav_pitch = nav_pitch;
-	packet.nav_bearing = nav_bearing;
-	packet.target_bearing = target_bearing;
-	packet.wp_dist = wp_dist;
-	packet.alt_error = alt_error;
-	packet.aspd_error = aspd_error;
-	packet.xtrack_error = xtrack_error;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT, (const char *)&packet, 26);
-#endif
-}
-
-#endif
-
-// MESSAGE NAV_CONTROLLER_OUTPUT UNPACKING
-
-
-/**
- * @brief Get field nav_roll from nav_controller_output message
- *
- * @return Current desired roll in degrees
- */
-static inline float mavlink_msg_nav_controller_output_get_nav_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field nav_pitch from nav_controller_output message
- *
- * @return Current desired pitch in degrees
- */
-static inline float mavlink_msg_nav_controller_output_get_nav_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field nav_bearing from nav_controller_output message
- *
- * @return Current desired heading in degrees
- */
-static inline int16_t mavlink_msg_nav_controller_output_get_nav_bearing(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field target_bearing from nav_controller_output message
- *
- * @return Bearing to current waypoint/target in degrees
- */
-static inline int16_t mavlink_msg_nav_controller_output_get_target_bearing(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field wp_dist from nav_controller_output message
- *
- * @return Distance to active waypoint in meters
- */
-static inline uint16_t mavlink_msg_nav_controller_output_get_wp_dist(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  12);
-}
-
-/**
- * @brief Get field alt_error from nav_controller_output message
- *
- * @return Current altitude error in meters
- */
-static inline float mavlink_msg_nav_controller_output_get_alt_error(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Get field aspd_error from nav_controller_output message
- *
- * @return Current airspeed error in meters/second
- */
-static inline float mavlink_msg_nav_controller_output_get_aspd_error(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  18);
-}
-
-/**
- * @brief Get field xtrack_error from nav_controller_output message
- *
- * @return Current crosstrack error on x-y plane in meters
- */
-static inline float mavlink_msg_nav_controller_output_get_xtrack_error(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  22);
-}
-
-/**
- * @brief Decode a nav_controller_output message into a struct
- *
- * @param msg The message to decode
- * @param nav_controller_output C-struct to decode the message contents into
- */
-static inline void mavlink_msg_nav_controller_output_decode(const mavlink_message_t* msg, mavlink_nav_controller_output_t* nav_controller_output)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	nav_controller_output->nav_roll = mavlink_msg_nav_controller_output_get_nav_roll(msg);
-	nav_controller_output->nav_pitch = mavlink_msg_nav_controller_output_get_nav_pitch(msg);
-	nav_controller_output->nav_bearing = mavlink_msg_nav_controller_output_get_nav_bearing(msg);
-	nav_controller_output->target_bearing = mavlink_msg_nav_controller_output_get_target_bearing(msg);
-	nav_controller_output->wp_dist = mavlink_msg_nav_controller_output_get_wp_dist(msg);
-	nav_controller_output->alt_error = mavlink_msg_nav_controller_output_get_alt_error(msg);
-	nav_controller_output->aspd_error = mavlink_msg_nav_controller_output_get_aspd_error(msg);
-	nav_controller_output->xtrack_error = mavlink_msg_nav_controller_output_get_xtrack_error(msg);
-#else
-	memcpy(nav_controller_output, _MAV_PAYLOAD(msg), 26);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_object_detection_event.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_object_detection_event.h
deleted file mode 100644
index 617eb50d4..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_object_detection_event.h
+++ /dev/null
@@ -1,270 +0,0 @@
-// MESSAGE OBJECT_DETECTION_EVENT PACKING
-
-#define MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT 140
-
-typedef struct __mavlink_object_detection_event_t
-{
- uint32_t time; ///< Timestamp in milliseconds since system boot
- uint16_t object_id; ///< Object ID
- uint8_t type; ///< Object type: 0: image, 1: letter, 2: ground vehicle, 3: air vehicle, 4: surface vehicle, 5: sub-surface vehicle, 6: human, 7: animal
- char name[20]; ///< Name of the object as defined by the detector
- uint8_t quality; ///< Detection quality / confidence. 0: bad, 255: maximum confidence
- float bearing; ///< Angle of the object with respect to the body frame in NED coordinates in radians. 0: front
- float distance; ///< Ground distance in meters
-} mavlink_object_detection_event_t;
-
-#define MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT_LEN 36
-#define MAVLINK_MSG_ID_140_LEN 36
-
-#define MAVLINK_MSG_OBJECT_DETECTION_EVENT_FIELD_NAME_LEN 20
-
-#define MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT { \
-	"OBJECT_DETECTION_EVENT", \
-	7, \
-	{  { "time", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_object_detection_event_t, time) }, \
-         { "object_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_object_detection_event_t, object_id) }, \
-         { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_object_detection_event_t, type) }, \
-         { "name", NULL, MAVLINK_TYPE_CHAR, 20, 7, offsetof(mavlink_object_detection_event_t, name) }, \
-         { "quality", NULL, MAVLINK_TYPE_UINT8_T, 0, 27, offsetof(mavlink_object_detection_event_t, quality) }, \
-         { "bearing", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_object_detection_event_t, bearing) }, \
-         { "distance", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_object_detection_event_t, distance) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a object_detection_event message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time Timestamp in milliseconds since system boot
- * @param object_id Object ID
- * @param type Object type: 0: image, 1: letter, 2: ground vehicle, 3: air vehicle, 4: surface vehicle, 5: sub-surface vehicle, 6: human, 7: animal
- * @param name Name of the object as defined by the detector
- * @param quality Detection quality / confidence. 0: bad, 255: maximum confidence
- * @param bearing Angle of the object with respect to the body frame in NED coordinates in radians. 0: front
- * @param distance Ground distance in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_object_detection_event_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint32_t time, uint16_t object_id, uint8_t type, const char *name, uint8_t quality, float bearing, float distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint32_t(buf, 0, time);
-	_mav_put_uint16_t(buf, 4, object_id);
-	_mav_put_uint8_t(buf, 6, type);
-	_mav_put_uint8_t(buf, 27, quality);
-	_mav_put_float(buf, 28, bearing);
-	_mav_put_float(buf, 32, distance);
-	_mav_put_char_array(buf, 7, name, 20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_object_detection_event_t packet;
-	packet.time = time;
-	packet.object_id = object_id;
-	packet.type = type;
-	packet.quality = quality;
-	packet.bearing = bearing;
-	packet.distance = distance;
-	mav_array_memcpy(packet.name, name, sizeof(char)*20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT;
-	return mavlink_finalize_message(msg, system_id, component_id, 36);
-}
-
-/**
- * @brief Pack a object_detection_event message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time Timestamp in milliseconds since system boot
- * @param object_id Object ID
- * @param type Object type: 0: image, 1: letter, 2: ground vehicle, 3: air vehicle, 4: surface vehicle, 5: sub-surface vehicle, 6: human, 7: animal
- * @param name Name of the object as defined by the detector
- * @param quality Detection quality / confidence. 0: bad, 255: maximum confidence
- * @param bearing Angle of the object with respect to the body frame in NED coordinates in radians. 0: front
- * @param distance Ground distance in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_object_detection_event_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint32_t time,uint16_t object_id,uint8_t type,const char *name,uint8_t quality,float bearing,float distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint32_t(buf, 0, time);
-	_mav_put_uint16_t(buf, 4, object_id);
-	_mav_put_uint8_t(buf, 6, type);
-	_mav_put_uint8_t(buf, 27, quality);
-	_mav_put_float(buf, 28, bearing);
-	_mav_put_float(buf, 32, distance);
-	_mav_put_char_array(buf, 7, name, 20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_object_detection_event_t packet;
-	packet.time = time;
-	packet.object_id = object_id;
-	packet.type = type;
-	packet.quality = quality;
-	packet.bearing = bearing;
-	packet.distance = distance;
-	mav_array_memcpy(packet.name, name, sizeof(char)*20);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 36);
-}
-
-/**
- * @brief Encode a object_detection_event struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param object_detection_event C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_object_detection_event_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_object_detection_event_t* object_detection_event)
-{
-	return mavlink_msg_object_detection_event_pack(system_id, component_id, msg, object_detection_event->time, object_detection_event->object_id, object_detection_event->type, object_detection_event->name, object_detection_event->quality, object_detection_event->bearing, object_detection_event->distance);
-}
-
-/**
- * @brief Send a object_detection_event message
- * @param chan MAVLink channel to send the message
- *
- * @param time Timestamp in milliseconds since system boot
- * @param object_id Object ID
- * @param type Object type: 0: image, 1: letter, 2: ground vehicle, 3: air vehicle, 4: surface vehicle, 5: sub-surface vehicle, 6: human, 7: animal
- * @param name Name of the object as defined by the detector
- * @param quality Detection quality / confidence. 0: bad, 255: maximum confidence
- * @param bearing Angle of the object with respect to the body frame in NED coordinates in radians. 0: front
- * @param distance Ground distance in meters
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_object_detection_event_send(mavlink_channel_t chan, uint32_t time, uint16_t object_id, uint8_t type, const char *name, uint8_t quality, float bearing, float distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint32_t(buf, 0, time);
-	_mav_put_uint16_t(buf, 4, object_id);
-	_mav_put_uint8_t(buf, 6, type);
-	_mav_put_uint8_t(buf, 27, quality);
-	_mav_put_float(buf, 28, bearing);
-	_mav_put_float(buf, 32, distance);
-	_mav_put_char_array(buf, 7, name, 20);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT, buf, 36);
-#else
-	mavlink_object_detection_event_t packet;
-	packet.time = time;
-	packet.object_id = object_id;
-	packet.type = type;
-	packet.quality = quality;
-	packet.bearing = bearing;
-	packet.distance = distance;
-	mav_array_memcpy(packet.name, name, sizeof(char)*20);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_OBJECT_DETECTION_EVENT, (const char *)&packet, 36);
-#endif
-}
-
-#endif
-
-// MESSAGE OBJECT_DETECTION_EVENT UNPACKING
-
-
-/**
- * @brief Get field time from object_detection_event message
- *
- * @return Timestamp in milliseconds since system boot
- */
-static inline uint32_t mavlink_msg_object_detection_event_get_time(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Get field object_id from object_detection_event message
- *
- * @return Object ID
- */
-static inline uint16_t mavlink_msg_object_detection_event_get_object_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field type from object_detection_event message
- *
- * @return Object type: 0: image, 1: letter, 2: ground vehicle, 3: air vehicle, 4: surface vehicle, 5: sub-surface vehicle, 6: human, 7: animal
- */
-static inline uint8_t mavlink_msg_object_detection_event_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field name from object_detection_event message
- *
- * @return Name of the object as defined by the detector
- */
-static inline uint16_t mavlink_msg_object_detection_event_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 20,  7);
-}
-
-/**
- * @brief Get field quality from object_detection_event message
- *
- * @return Detection quality / confidence. 0: bad, 255: maximum confidence
- */
-static inline uint8_t mavlink_msg_object_detection_event_get_quality(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  27);
-}
-
-/**
- * @brief Get field bearing from object_detection_event message
- *
- * @return Angle of the object with respect to the body frame in NED coordinates in radians. 0: front
- */
-static inline float mavlink_msg_object_detection_event_get_bearing(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field distance from object_detection_event message
- *
- * @return Ground distance in meters
- */
-static inline float mavlink_msg_object_detection_event_get_distance(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Decode a object_detection_event message into a struct
- *
- * @param msg The message to decode
- * @param object_detection_event C-struct to decode the message contents into
- */
-static inline void mavlink_msg_object_detection_event_decode(const mavlink_message_t* msg, mavlink_object_detection_event_t* object_detection_event)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	object_detection_event->time = mavlink_msg_object_detection_event_get_time(msg);
-	object_detection_event->object_id = mavlink_msg_object_detection_event_get_object_id(msg);
-	object_detection_event->type = mavlink_msg_object_detection_event_get_type(msg);
-	mavlink_msg_object_detection_event_get_name(msg, object_detection_event->name);
-	object_detection_event->quality = mavlink_msg_object_detection_event_get_quality(msg);
-	object_detection_event->bearing = mavlink_msg_object_detection_event_get_bearing(msg);
-	object_detection_event->distance = mavlink_msg_object_detection_event_get_distance(msg);
-#else
-	memcpy(object_detection_event, _MAV_PAYLOAD(msg), 36);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_optical_flow.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_optical_flow.h
deleted file mode 100644
index 33067cc89..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_optical_flow.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE OPTICAL_FLOW PACKING
-
-#define MAVLINK_MSG_ID_OPTICAL_FLOW 100
-
-typedef struct __mavlink_optical_flow_t
-{
- uint64_t time; ///< Timestamp (UNIX)
- uint8_t sensor_id; ///< Sensor ID
- int16_t flow_x; ///< Flow in pixels in x-sensor direction
- int16_t flow_y; ///< Flow in pixels in y-sensor direction
- uint8_t quality; ///< Optical flow quality / confidence. 0: bad, 255: maximum quality
- float ground_distance; ///< Ground distance in meters
-} mavlink_optical_flow_t;
-
-#define MAVLINK_MSG_ID_OPTICAL_FLOW_LEN 18
-#define MAVLINK_MSG_ID_100_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_OPTICAL_FLOW { \
-	"OPTICAL_FLOW", \
-	6, \
-	{  { "time", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_optical_flow_t, time) }, \
-         { "sensor_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_optical_flow_t, sensor_id) }, \
-         { "flow_x", NULL, MAVLINK_TYPE_INT16_T, 0, 9, offsetof(mavlink_optical_flow_t, flow_x) }, \
-         { "flow_y", NULL, MAVLINK_TYPE_INT16_T, 0, 11, offsetof(mavlink_optical_flow_t, flow_y) }, \
-         { "quality", NULL, MAVLINK_TYPE_UINT8_T, 0, 13, offsetof(mavlink_optical_flow_t, quality) }, \
-         { "ground_distance", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_optical_flow_t, ground_distance) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a optical_flow message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time Timestamp (UNIX)
- * @param sensor_id Sensor ID
- * @param flow_x Flow in pixels in x-sensor direction
- * @param flow_y Flow in pixels in y-sensor direction
- * @param quality Optical flow quality / confidence. 0: bad, 255: maximum quality
- * @param ground_distance Ground distance in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_optical_flow_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t time, uint8_t sensor_id, int16_t flow_x, int16_t flow_y, uint8_t quality, float ground_distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, time);
-	_mav_put_uint8_t(buf, 8, sensor_id);
-	_mav_put_int16_t(buf, 9, flow_x);
-	_mav_put_int16_t(buf, 11, flow_y);
-	_mav_put_uint8_t(buf, 13, quality);
-	_mav_put_float(buf, 14, ground_distance);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_optical_flow_t packet;
-	packet.time = time;
-	packet.sensor_id = sensor_id;
-	packet.flow_x = flow_x;
-	packet.flow_y = flow_y;
-	packet.quality = quality;
-	packet.ground_distance = ground_distance;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_OPTICAL_FLOW;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a optical_flow message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time Timestamp (UNIX)
- * @param sensor_id Sensor ID
- * @param flow_x Flow in pixels in x-sensor direction
- * @param flow_y Flow in pixels in y-sensor direction
- * @param quality Optical flow quality / confidence. 0: bad, 255: maximum quality
- * @param ground_distance Ground distance in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_optical_flow_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t time,uint8_t sensor_id,int16_t flow_x,int16_t flow_y,uint8_t quality,float ground_distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, time);
-	_mav_put_uint8_t(buf, 8, sensor_id);
-	_mav_put_int16_t(buf, 9, flow_x);
-	_mav_put_int16_t(buf, 11, flow_y);
-	_mav_put_uint8_t(buf, 13, quality);
-	_mav_put_float(buf, 14, ground_distance);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_optical_flow_t packet;
-	packet.time = time;
-	packet.sensor_id = sensor_id;
-	packet.flow_x = flow_x;
-	packet.flow_y = flow_y;
-	packet.quality = quality;
-	packet.ground_distance = ground_distance;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_OPTICAL_FLOW;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a optical_flow struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param optical_flow C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_optical_flow_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_optical_flow_t* optical_flow)
-{
-	return mavlink_msg_optical_flow_pack(system_id, component_id, msg, optical_flow->time, optical_flow->sensor_id, optical_flow->flow_x, optical_flow->flow_y, optical_flow->quality, optical_flow->ground_distance);
-}
-
-/**
- * @brief Send a optical_flow message
- * @param chan MAVLink channel to send the message
- *
- * @param time Timestamp (UNIX)
- * @param sensor_id Sensor ID
- * @param flow_x Flow in pixels in x-sensor direction
- * @param flow_y Flow in pixels in y-sensor direction
- * @param quality Optical flow quality / confidence. 0: bad, 255: maximum quality
- * @param ground_distance Ground distance in meters
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_optical_flow_send(mavlink_channel_t chan, uint64_t time, uint8_t sensor_id, int16_t flow_x, int16_t flow_y, uint8_t quality, float ground_distance)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, time);
-	_mav_put_uint8_t(buf, 8, sensor_id);
-	_mav_put_int16_t(buf, 9, flow_x);
-	_mav_put_int16_t(buf, 11, flow_y);
-	_mav_put_uint8_t(buf, 13, quality);
-	_mav_put_float(buf, 14, ground_distance);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_OPTICAL_FLOW, buf, 18);
-#else
-	mavlink_optical_flow_t packet;
-	packet.time = time;
-	packet.sensor_id = sensor_id;
-	packet.flow_x = flow_x;
-	packet.flow_y = flow_y;
-	packet.quality = quality;
-	packet.ground_distance = ground_distance;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_OPTICAL_FLOW, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE OPTICAL_FLOW UNPACKING
-
-
-/**
- * @brief Get field time from optical_flow message
- *
- * @return Timestamp (UNIX)
- */
-static inline uint64_t mavlink_msg_optical_flow_get_time(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field sensor_id from optical_flow message
- *
- * @return Sensor ID
- */
-static inline uint8_t mavlink_msg_optical_flow_get_sensor_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field flow_x from optical_flow message
- *
- * @return Flow in pixels in x-sensor direction
- */
-static inline int16_t mavlink_msg_optical_flow_get_flow_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  9);
-}
-
-/**
- * @brief Get field flow_y from optical_flow message
- *
- * @return Flow in pixels in y-sensor direction
- */
-static inline int16_t mavlink_msg_optical_flow_get_flow_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  11);
-}
-
-/**
- * @brief Get field quality from optical_flow message
- *
- * @return Optical flow quality / confidence. 0: bad, 255: maximum quality
- */
-static inline uint8_t mavlink_msg_optical_flow_get_quality(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  13);
-}
-
-/**
- * @brief Get field ground_distance from optical_flow message
- *
- * @return Ground distance in meters
- */
-static inline float mavlink_msg_optical_flow_get_ground_distance(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a optical_flow message into a struct
- *
- * @param msg The message to decode
- * @param optical_flow C-struct to decode the message contents into
- */
-static inline void mavlink_msg_optical_flow_decode(const mavlink_message_t* msg, mavlink_optical_flow_t* optical_flow)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	optical_flow->time = mavlink_msg_optical_flow_get_time(msg);
-	optical_flow->sensor_id = mavlink_msg_optical_flow_get_sensor_id(msg);
-	optical_flow->flow_x = mavlink_msg_optical_flow_get_flow_x(msg);
-	optical_flow->flow_y = mavlink_msg_optical_flow_get_flow_y(msg);
-	optical_flow->quality = mavlink_msg_optical_flow_get_quality(msg);
-	optical_flow->ground_distance = mavlink_msg_optical_flow_get_ground_distance(msg);
-#else
-	memcpy(optical_flow, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_list.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_list.h
deleted file mode 100644
index 39e35915e..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_list.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE PARAM_REQUEST_LIST PACKING
-
-#define MAVLINK_MSG_ID_PARAM_REQUEST_LIST 21
-
-typedef struct __mavlink_param_request_list_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
-} mavlink_param_request_list_t;
-
-#define MAVLINK_MSG_ID_PARAM_REQUEST_LIST_LEN 2
-#define MAVLINK_MSG_ID_21_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST { \
-	"PARAM_REQUEST_LIST", \
-	2, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_param_request_list_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_param_request_list_t, target_component) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a param_request_list message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_request_list_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_param_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_REQUEST_LIST;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a param_request_list message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_request_list_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_param_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_REQUEST_LIST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a param_request_list struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param param_request_list C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_param_request_list_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_param_request_list_t* param_request_list)
-{
-	return mavlink_msg_param_request_list_pack(system_id, component_id, msg, param_request_list->target_system, param_request_list->target_component);
-}
-
-/**
- * @brief Send a param_request_list message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_param_request_list_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_REQUEST_LIST, buf, 2);
-#else
-	mavlink_param_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_REQUEST_LIST, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE PARAM_REQUEST_LIST UNPACKING
-
-
-/**
- * @brief Get field target_system from param_request_list message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_param_request_list_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from param_request_list message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_param_request_list_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a param_request_list message into a struct
- *
- * @param msg The message to decode
- * @param param_request_list C-struct to decode the message contents into
- */
-static inline void mavlink_msg_param_request_list_decode(const mavlink_message_t* msg, mavlink_param_request_list_t* param_request_list)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	param_request_list->target_system = mavlink_msg_param_request_list_get_target_system(msg);
-	param_request_list->target_component = mavlink_msg_param_request_list_get_target_component(msg);
-#else
-	memcpy(param_request_list, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_read.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_read.h
deleted file mode 100644
index c02cb0449..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_request_read.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// MESSAGE PARAM_REQUEST_READ PACKING
-
-#define MAVLINK_MSG_ID_PARAM_REQUEST_READ 20
-
-typedef struct __mavlink_param_request_read_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int8_t param_id[15]; ///< Onboard parameter id
- int16_t param_index; ///< Parameter index. Send -1 to use the param ID field as identifier
-} mavlink_param_request_read_t;
-
-#define MAVLINK_MSG_ID_PARAM_REQUEST_READ_LEN 19
-#define MAVLINK_MSG_ID_20_LEN 19
-
-#define MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN 15
-
-#define MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ { \
-	"PARAM_REQUEST_READ", \
-	4, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_param_request_read_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_param_request_read_t, target_component) }, \
-         { "param_id", NULL, MAVLINK_TYPE_INT8_T, 15, 2, offsetof(mavlink_param_request_read_t, param_id) }, \
-         { "param_index", NULL, MAVLINK_TYPE_INT16_T, 0, 17, offsetof(mavlink_param_request_read_t, param_index) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a param_request_read message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_request_read_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, const int8_t *param_id, int16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[19];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 17, param_index);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 19);
-#else
-	mavlink_param_request_read_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 19);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_REQUEST_READ;
-	return mavlink_finalize_message(msg, system_id, component_id, 19);
-}
-
-/**
- * @brief Pack a param_request_read message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_request_read_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,const int8_t *param_id,int16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[19];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 17, param_index);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 19);
-#else
-	mavlink_param_request_read_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 19);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_REQUEST_READ;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 19);
-}
-
-/**
- * @brief Encode a param_request_read struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param param_request_read C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_param_request_read_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_param_request_read_t* param_request_read)
-{
-	return mavlink_msg_param_request_read_pack(system_id, component_id, msg, param_request_read->target_system, param_request_read->target_component, param_request_read->param_id, param_request_read->param_index);
-}
-
-/**
- * @brief Send a param_request_read message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_param_request_read_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const int8_t *param_id, int16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[19];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_int16_t(buf, 17, param_index);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_REQUEST_READ, buf, 19);
-#else
-	mavlink_param_request_read_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_REQUEST_READ, (const char *)&packet, 19);
-#endif
-}
-
-#endif
-
-// MESSAGE PARAM_REQUEST_READ UNPACKING
-
-
-/**
- * @brief Get field target_system from param_request_read message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_param_request_read_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from param_request_read message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_param_request_read_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field param_id from param_request_read message
- *
- * @return Onboard parameter id
- */
-static inline uint16_t mavlink_msg_param_request_read_get_param_id(const mavlink_message_t* msg, int8_t *param_id)
-{
-	return _MAV_RETURN_int8_t_array(msg, param_id, 15,  2);
-}
-
-/**
- * @brief Get field param_index from param_request_read message
- *
- * @return Parameter index. Send -1 to use the param ID field as identifier
- */
-static inline int16_t mavlink_msg_param_request_read_get_param_index(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  17);
-}
-
-/**
- * @brief Decode a param_request_read message into a struct
- *
- * @param msg The message to decode
- * @param param_request_read C-struct to decode the message contents into
- */
-static inline void mavlink_msg_param_request_read_decode(const mavlink_message_t* msg, mavlink_param_request_read_t* param_request_read)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	param_request_read->target_system = mavlink_msg_param_request_read_get_target_system(msg);
-	param_request_read->target_component = mavlink_msg_param_request_read_get_target_component(msg);
-	mavlink_msg_param_request_read_get_param_id(msg, param_request_read->param_id);
-	param_request_read->param_index = mavlink_msg_param_request_read_get_param_index(msg);
-#else
-	memcpy(param_request_read, _MAV_PAYLOAD(msg), 19);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_set.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_set.h
deleted file mode 100644
index e6648430f..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_set.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// MESSAGE PARAM_SET PACKING
-
-#define MAVLINK_MSG_ID_PARAM_SET 23
-
-typedef struct __mavlink_param_set_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- int8_t param_id[15]; ///< Onboard parameter id
- float param_value; ///< Onboard parameter value
-} mavlink_param_set_t;
-
-#define MAVLINK_MSG_ID_PARAM_SET_LEN 21
-#define MAVLINK_MSG_ID_23_LEN 21
-
-#define MAVLINK_MSG_PARAM_SET_FIELD_PARAM_ID_LEN 15
-
-#define MAVLINK_MESSAGE_INFO_PARAM_SET { \
-	"PARAM_SET", \
-	4, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_param_set_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_param_set_t, target_component) }, \
-         { "param_id", NULL, MAVLINK_TYPE_INT8_T, 15, 2, offsetof(mavlink_param_set_t, param_id) }, \
-         { "param_value", NULL, MAVLINK_TYPE_FLOAT, 0, 17, offsetof(mavlink_param_set_t, param_value) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a param_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, const int8_t *param_id, float param_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 17, param_value);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_param_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_value = param_value;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 21);
-}
-
-/**
- * @brief Pack a param_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,const int8_t *param_id,float param_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 17, param_value);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_param_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_value = param_value;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 21);
-}
-
-/**
- * @brief Encode a param_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param param_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_param_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_param_set_t* param_set)
-{
-	return mavlink_msg_param_set_pack(system_id, component_id, msg, param_set->target_system, param_set->target_component, param_set->param_id, param_set->param_value);
-}
-
-/**
- * @brief Send a param_set message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_param_set_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const int8_t *param_id, float param_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 17, param_value);
-	_mav_put_int8_t_array(buf, 2, param_id, 15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_SET, buf, 21);
-#else
-	mavlink_param_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.param_value = param_value;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_SET, (const char *)&packet, 21);
-#endif
-}
-
-#endif
-
-// MESSAGE PARAM_SET UNPACKING
-
-
-/**
- * @brief Get field target_system from param_set message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_param_set_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from param_set message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_param_set_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field param_id from param_set message
- *
- * @return Onboard parameter id
- */
-static inline uint16_t mavlink_msg_param_set_get_param_id(const mavlink_message_t* msg, int8_t *param_id)
-{
-	return _MAV_RETURN_int8_t_array(msg, param_id, 15,  2);
-}
-
-/**
- * @brief Get field param_value from param_set message
- *
- * @return Onboard parameter value
- */
-static inline float mavlink_msg_param_set_get_param_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  17);
-}
-
-/**
- * @brief Decode a param_set message into a struct
- *
- * @param msg The message to decode
- * @param param_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_param_set_decode(const mavlink_message_t* msg, mavlink_param_set_t* param_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	param_set->target_system = mavlink_msg_param_set_get_target_system(msg);
-	param_set->target_component = mavlink_msg_param_set_get_target_component(msg);
-	mavlink_msg_param_set_get_param_id(msg, param_set->param_id);
-	param_set->param_value = mavlink_msg_param_set_get_param_value(msg);
-#else
-	memcpy(param_set, _MAV_PAYLOAD(msg), 21);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_value.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_value.h
deleted file mode 100644
index 634fbb152..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_param_value.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// MESSAGE PARAM_VALUE PACKING
-
-#define MAVLINK_MSG_ID_PARAM_VALUE 22
-
-typedef struct __mavlink_param_value_t
-{
- int8_t param_id[15]; ///< Onboard parameter id
- float param_value; ///< Onboard parameter value
- uint16_t param_count; ///< Total number of onboard parameters
- uint16_t param_index; ///< Index of this onboard parameter
-} mavlink_param_value_t;
-
-#define MAVLINK_MSG_ID_PARAM_VALUE_LEN 23
-#define MAVLINK_MSG_ID_22_LEN 23
-
-#define MAVLINK_MSG_PARAM_VALUE_FIELD_PARAM_ID_LEN 15
-
-#define MAVLINK_MESSAGE_INFO_PARAM_VALUE { \
-	"PARAM_VALUE", \
-	4, \
-	{  { "param_id", NULL, MAVLINK_TYPE_INT8_T, 15, 0, offsetof(mavlink_param_value_t, param_id) }, \
-         { "param_value", NULL, MAVLINK_TYPE_FLOAT, 0, 15, offsetof(mavlink_param_value_t, param_value) }, \
-         { "param_count", NULL, MAVLINK_TYPE_UINT16_T, 0, 19, offsetof(mavlink_param_value_t, param_count) }, \
-         { "param_index", NULL, MAVLINK_TYPE_UINT16_T, 0, 21, offsetof(mavlink_param_value_t, param_index) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a param_value message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- * @param param_count Total number of onboard parameters
- * @param param_index Index of this onboard parameter
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_value_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const int8_t *param_id, float param_value, uint16_t param_count, uint16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[23];
-	_mav_put_float(buf, 15, param_value);
-	_mav_put_uint16_t(buf, 19, param_count);
-	_mav_put_uint16_t(buf, 21, param_index);
-	_mav_put_int8_t_array(buf, 0, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 23);
-#else
-	mavlink_param_value_t packet;
-	packet.param_value = param_value;
-	packet.param_count = param_count;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 23);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_VALUE;
-	return mavlink_finalize_message(msg, system_id, component_id, 23);
-}
-
-/**
- * @brief Pack a param_value message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- * @param param_count Total number of onboard parameters
- * @param param_index Index of this onboard parameter
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_param_value_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const int8_t *param_id,float param_value,uint16_t param_count,uint16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[23];
-	_mav_put_float(buf, 15, param_value);
-	_mav_put_uint16_t(buf, 19, param_count);
-	_mav_put_uint16_t(buf, 21, param_index);
-	_mav_put_int8_t_array(buf, 0, param_id, 15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 23);
-#else
-	mavlink_param_value_t packet;
-	packet.param_value = param_value;
-	packet.param_count = param_count;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 23);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PARAM_VALUE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 23);
-}
-
-/**
- * @brief Encode a param_value struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param param_value C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_param_value_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_param_value_t* param_value)
-{
-	return mavlink_msg_param_value_pack(system_id, component_id, msg, param_value->param_id, param_value->param_value, param_value->param_count, param_value->param_index);
-}
-
-/**
- * @brief Send a param_value message
- * @param chan MAVLink channel to send the message
- *
- * @param param_id Onboard parameter id
- * @param param_value Onboard parameter value
- * @param param_count Total number of onboard parameters
- * @param param_index Index of this onboard parameter
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_param_value_send(mavlink_channel_t chan, const int8_t *param_id, float param_value, uint16_t param_count, uint16_t param_index)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[23];
-	_mav_put_float(buf, 15, param_value);
-	_mav_put_uint16_t(buf, 19, param_count);
-	_mav_put_uint16_t(buf, 21, param_index);
-	_mav_put_int8_t_array(buf, 0, param_id, 15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_VALUE, buf, 23);
-#else
-	mavlink_param_value_t packet;
-	packet.param_value = param_value;
-	packet.param_count = param_count;
-	packet.param_index = param_index;
-	mav_array_memcpy(packet.param_id, param_id, sizeof(int8_t)*15);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PARAM_VALUE, (const char *)&packet, 23);
-#endif
-}
-
-#endif
-
-// MESSAGE PARAM_VALUE UNPACKING
-
-
-/**
- * @brief Get field param_id from param_value message
- *
- * @return Onboard parameter id
- */
-static inline uint16_t mavlink_msg_param_value_get_param_id(const mavlink_message_t* msg, int8_t *param_id)
-{
-	return _MAV_RETURN_int8_t_array(msg, param_id, 15,  0);
-}
-
-/**
- * @brief Get field param_value from param_value message
- *
- * @return Onboard parameter value
- */
-static inline float mavlink_msg_param_value_get_param_value(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  15);
-}
-
-/**
- * @brief Get field param_count from param_value message
- *
- * @return Total number of onboard parameters
- */
-static inline uint16_t mavlink_msg_param_value_get_param_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  19);
-}
-
-/**
- * @brief Get field param_index from param_value message
- *
- * @return Index of this onboard parameter
- */
-static inline uint16_t mavlink_msg_param_value_get_param_index(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  21);
-}
-
-/**
- * @brief Decode a param_value message into a struct
- *
- * @param msg The message to decode
- * @param param_value C-struct to decode the message contents into
- */
-static inline void mavlink_msg_param_value_decode(const mavlink_message_t* msg, mavlink_param_value_t* param_value)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_param_value_get_param_id(msg, param_value->param_id);
-	param_value->param_value = mavlink_msg_param_value_get_param_value(msg);
-	param_value->param_count = mavlink_msg_param_value_get_param_count(msg);
-	param_value->param_index = mavlink_msg_param_value_get_param_index(msg);
-#else
-	memcpy(param_value, _MAV_PAYLOAD(msg), 23);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_ping.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_ping.h
deleted file mode 100644
index ad076fd9b..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_ping.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE PING PACKING
-
-#define MAVLINK_MSG_ID_PING 3
-
-typedef struct __mavlink_ping_t
-{
- uint32_t seq; ///< PING sequence
- uint8_t target_system; ///< 0: request ping from all receiving systems, if greater than 0: message is a ping response and number is the system id of the requesting system
- uint8_t target_component; ///< 0: request ping from all receiving components, if greater than 0: message is a ping response and number is the system id of the requesting system
- uint64_t time; ///< Unix timestamp in microseconds
-} mavlink_ping_t;
-
-#define MAVLINK_MSG_ID_PING_LEN 14
-#define MAVLINK_MSG_ID_3_LEN 14
-
-
-
-#define MAVLINK_MESSAGE_INFO_PING { \
-	"PING", \
-	4, \
-	{  { "seq", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_ping_t, seq) }, \
-         { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_ping_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_ping_t, target_component) }, \
-         { "time", NULL, MAVLINK_TYPE_UINT64_T, 0, 6, offsetof(mavlink_ping_t, time) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ping message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param seq PING sequence
- * @param target_system 0: request ping from all receiving systems, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param target_component 0: request ping from all receiving components, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param time Unix timestamp in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ping_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint32_t seq, uint8_t target_system, uint8_t target_component, uint64_t time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint32_t(buf, 0, seq);
-	_mav_put_uint8_t(buf, 4, target_system);
-	_mav_put_uint8_t(buf, 5, target_component);
-	_mav_put_uint64_t(buf, 6, time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_ping_t packet;
-	packet.seq = seq;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.time = time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PING;
-	return mavlink_finalize_message(msg, system_id, component_id, 14);
-}
-
-/**
- * @brief Pack a ping message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param seq PING sequence
- * @param target_system 0: request ping from all receiving systems, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param target_component 0: request ping from all receiving components, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param time Unix timestamp in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ping_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint32_t seq,uint8_t target_system,uint8_t target_component,uint64_t time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint32_t(buf, 0, seq);
-	_mav_put_uint8_t(buf, 4, target_system);
-	_mav_put_uint8_t(buf, 5, target_component);
-	_mav_put_uint64_t(buf, 6, time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 14);
-#else
-	mavlink_ping_t packet;
-	packet.seq = seq;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.time = time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PING;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14);
-}
-
-/**
- * @brief Encode a ping struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ping C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ping_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ping_t* ping)
-{
-	return mavlink_msg_ping_pack(system_id, component_id, msg, ping->seq, ping->target_system, ping->target_component, ping->time);
-}
-
-/**
- * @brief Send a ping message
- * @param chan MAVLink channel to send the message
- *
- * @param seq PING sequence
- * @param target_system 0: request ping from all receiving systems, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param target_component 0: request ping from all receiving components, if greater than 0: message is a ping response and number is the system id of the requesting system
- * @param time Unix timestamp in microseconds
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ping_send(mavlink_channel_t chan, uint32_t seq, uint8_t target_system, uint8_t target_component, uint64_t time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_uint32_t(buf, 0, seq);
-	_mav_put_uint8_t(buf, 4, target_system);
-	_mav_put_uint8_t(buf, 5, target_component);
-	_mav_put_uint64_t(buf, 6, time);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PING, buf, 14);
-#else
-	mavlink_ping_t packet;
-	packet.seq = seq;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.time = time;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PING, (const char *)&packet, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE PING UNPACKING
-
-
-/**
- * @brief Get field seq from ping message
- *
- * @return PING sequence
- */
-static inline uint32_t mavlink_msg_ping_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Get field target_system from ping message
- *
- * @return 0: request ping from all receiving systems, if greater than 0: message is a ping response and number is the system id of the requesting system
- */
-static inline uint8_t mavlink_msg_ping_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field target_component from ping message
- *
- * @return 0: request ping from all receiving components, if greater than 0: message is a ping response and number is the system id of the requesting system
- */
-static inline uint8_t mavlink_msg_ping_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field time from ping message
- *
- * @return Unix timestamp in microseconds
- */
-static inline uint64_t mavlink_msg_ping_get_time(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  6);
-}
-
-/**
- * @brief Decode a ping message into a struct
- *
- * @param msg The message to decode
- * @param ping C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ping_decode(const mavlink_message_t* msg, mavlink_ping_t* ping)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ping->seq = mavlink_msg_ping_get_seq(msg);
-	ping->target_system = mavlink_msg_ping_get_target_system(msg);
-	ping->target_component = mavlink_msg_ping_get_target_component(msg);
-	ping->time = mavlink_msg_ping_get_time(msg);
-#else
-	memcpy(ping, _MAV_PAYLOAD(msg), 14);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_position_target.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_position_target.h
deleted file mode 100644
index 6cd7719fb..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_position_target.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE POSITION_TARGET PACKING
-
-#define MAVLINK_MSG_ID_POSITION_TARGET 63
-
-typedef struct __mavlink_position_target_t
-{
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float yaw; ///< yaw orientation in radians, 0 = NORTH
-} mavlink_position_target_t;
-
-#define MAVLINK_MSG_ID_POSITION_TARGET_LEN 16
-#define MAVLINK_MSG_ID_63_LEN 16
-
-
-
-#define MAVLINK_MESSAGE_INFO_POSITION_TARGET { \
-	"POSITION_TARGET", \
-	4, \
-	{  { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_position_target_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_position_target_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_position_target_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_position_target_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a position_target message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_target_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_position_target_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_TARGET;
-	return mavlink_finalize_message(msg, system_id, component_id, 16);
-}
-
-/**
- * @brief Pack a position_target message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_target_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_position_target_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_TARGET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
-}
-
-/**
- * @brief Encode a position_target struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param position_target C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_position_target_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_position_target_t* position_target)
-{
-	return mavlink_msg_position_target_pack(system_id, component_id, msg, position_target->x, position_target->y, position_target->z, position_target->yaw);
-}
-
-/**
- * @brief Send a position_target message
- * @param chan MAVLink channel to send the message
- *
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_position_target_send(mavlink_channel_t chan, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_float(buf, 12, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_TARGET, buf, 16);
-#else
-	mavlink_position_target_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_TARGET, (const char *)&packet, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE POSITION_TARGET UNPACKING
-
-
-/**
- * @brief Get field x from position_target message
- *
- * @return x position
- */
-static inline float mavlink_msg_position_target_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field y from position_target message
- *
- * @return y position
- */
-static inline float mavlink_msg_position_target_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field z from position_target message
- *
- * @return z position
- */
-static inline float mavlink_msg_position_target_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field yaw from position_target message
- *
- * @return yaw orientation in radians, 0 = NORTH
- */
-static inline float mavlink_msg_position_target_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Decode a position_target message into a struct
- *
- * @param msg The message to decode
- * @param position_target C-struct to decode the message contents into
- */
-static inline void mavlink_msg_position_target_decode(const mavlink_message_t* msg, mavlink_position_target_t* position_target)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	position_target->x = mavlink_msg_position_target_get_x(msg);
-	position_target->y = mavlink_msg_position_target_get_y(msg);
-	position_target->z = mavlink_msg_position_target_get_z(msg);
-	position_target->yaw = mavlink_msg_position_target_get_yaw(msg);
-#else
-	memcpy(position_target, _MAV_PAYLOAD(msg), 16);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_imu.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_imu.h
deleted file mode 100644
index c60945ae9..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_imu.h
+++ /dev/null
@@ -1,342 +0,0 @@
-// MESSAGE RAW_IMU PACKING
-
-#define MAVLINK_MSG_ID_RAW_IMU 28
-
-typedef struct __mavlink_raw_imu_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- int16_t xacc; ///< X acceleration (raw)
- int16_t yacc; ///< Y acceleration (raw)
- int16_t zacc; ///< Z acceleration (raw)
- int16_t xgyro; ///< Angular speed around X axis (raw)
- int16_t ygyro; ///< Angular speed around Y axis (raw)
- int16_t zgyro; ///< Angular speed around Z axis (raw)
- int16_t xmag; ///< X Magnetic field (raw)
- int16_t ymag; ///< Y Magnetic field (raw)
- int16_t zmag; ///< Z Magnetic field (raw)
-} mavlink_raw_imu_t;
-
-#define MAVLINK_MSG_ID_RAW_IMU_LEN 26
-#define MAVLINK_MSG_ID_28_LEN 26
-
-
-
-#define MAVLINK_MESSAGE_INFO_RAW_IMU { \
-	"RAW_IMU", \
-	10, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_raw_imu_t, usec) }, \
-         { "xacc", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_imu_t, xacc) }, \
-         { "yacc", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_imu_t, yacc) }, \
-         { "zacc", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_raw_imu_t, zacc) }, \
-         { "xgyro", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_raw_imu_t, xgyro) }, \
-         { "ygyro", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_raw_imu_t, ygyro) }, \
-         { "zgyro", NULL, MAVLINK_TYPE_INT16_T, 0, 18, offsetof(mavlink_raw_imu_t, zgyro) }, \
-         { "xmag", NULL, MAVLINK_TYPE_INT16_T, 0, 20, offsetof(mavlink_raw_imu_t, xmag) }, \
-         { "ymag", NULL, MAVLINK_TYPE_INT16_T, 0, 22, offsetof(mavlink_raw_imu_t, ymag) }, \
-         { "zmag", NULL, MAVLINK_TYPE_INT16_T, 0, 24, offsetof(mavlink_raw_imu_t, zmag) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a raw_imu message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (raw)
- * @param yacc Y acceleration (raw)
- * @param zacc Z acceleration (raw)
- * @param xgyro Angular speed around X axis (raw)
- * @param ygyro Angular speed around Y axis (raw)
- * @param zgyro Angular speed around Z axis (raw)
- * @param xmag X Magnetic field (raw)
- * @param ymag Y Magnetic field (raw)
- * @param zmag Z Magnetic field (raw)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_imu_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, int16_t xacc, int16_t yacc, int16_t zacc, int16_t xgyro, int16_t ygyro, int16_t zgyro, int16_t xmag, int16_t ymag, int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_raw_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_IMU;
-	return mavlink_finalize_message(msg, system_id, component_id, 26);
-}
-
-/**
- * @brief Pack a raw_imu message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (raw)
- * @param yacc Y acceleration (raw)
- * @param zacc Z acceleration (raw)
- * @param xgyro Angular speed around X axis (raw)
- * @param ygyro Angular speed around Y axis (raw)
- * @param zgyro Angular speed around Z axis (raw)
- * @param xmag X Magnetic field (raw)
- * @param ymag Y Magnetic field (raw)
- * @param zmag Z Magnetic field (raw)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_imu_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,int16_t xacc,int16_t yacc,int16_t zacc,int16_t xgyro,int16_t ygyro,int16_t zgyro,int16_t xmag,int16_t ymag,int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_raw_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_IMU;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
-}
-
-/**
- * @brief Encode a raw_imu struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param raw_imu C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_raw_imu_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_raw_imu_t* raw_imu)
-{
-	return mavlink_msg_raw_imu_pack(system_id, component_id, msg, raw_imu->usec, raw_imu->xacc, raw_imu->yacc, raw_imu->zacc, raw_imu->xgyro, raw_imu->ygyro, raw_imu->zgyro, raw_imu->xmag, raw_imu->ymag, raw_imu->zmag);
-}
-
-/**
- * @brief Send a raw_imu message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (raw)
- * @param yacc Y acceleration (raw)
- * @param zacc Z acceleration (raw)
- * @param xgyro Angular speed around X axis (raw)
- * @param ygyro Angular speed around Y axis (raw)
- * @param zgyro Angular speed around Z axis (raw)
- * @param xmag X Magnetic field (raw)
- * @param ymag Y Magnetic field (raw)
- * @param zmag Z Magnetic field (raw)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_raw_imu_send(mavlink_channel_t chan, uint64_t usec, int16_t xacc, int16_t yacc, int16_t zacc, int16_t xgyro, int16_t ygyro, int16_t zgyro, int16_t xmag, int16_t ymag, int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_IMU, buf, 26);
-#else
-	mavlink_raw_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_IMU, (const char *)&packet, 26);
-#endif
-}
-
-#endif
-
-// MESSAGE RAW_IMU UNPACKING
-
-
-/**
- * @brief Get field usec from raw_imu message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_raw_imu_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field xacc from raw_imu message
- *
- * @return X acceleration (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_xacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field yacc from raw_imu message
- *
- * @return Y acceleration (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_yacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field zacc from raw_imu message
- *
- * @return Z acceleration (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_zacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field xgyro from raw_imu message
- *
- * @return Angular speed around X axis (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_xgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field ygyro from raw_imu message
- *
- * @return Angular speed around Y axis (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_ygyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Get field zgyro from raw_imu message
- *
- * @return Angular speed around Z axis (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_zgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  18);
-}
-
-/**
- * @brief Get field xmag from raw_imu message
- *
- * @return X Magnetic field (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_xmag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  20);
-}
-
-/**
- * @brief Get field ymag from raw_imu message
- *
- * @return Y Magnetic field (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_ymag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  22);
-}
-
-/**
- * @brief Get field zmag from raw_imu message
- *
- * @return Z Magnetic field (raw)
- */
-static inline int16_t mavlink_msg_raw_imu_get_zmag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  24);
-}
-
-/**
- * @brief Decode a raw_imu message into a struct
- *
- * @param msg The message to decode
- * @param raw_imu C-struct to decode the message contents into
- */
-static inline void mavlink_msg_raw_imu_decode(const mavlink_message_t* msg, mavlink_raw_imu_t* raw_imu)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	raw_imu->usec = mavlink_msg_raw_imu_get_usec(msg);
-	raw_imu->xacc = mavlink_msg_raw_imu_get_xacc(msg);
-	raw_imu->yacc = mavlink_msg_raw_imu_get_yacc(msg);
-	raw_imu->zacc = mavlink_msg_raw_imu_get_zacc(msg);
-	raw_imu->xgyro = mavlink_msg_raw_imu_get_xgyro(msg);
-	raw_imu->ygyro = mavlink_msg_raw_imu_get_ygyro(msg);
-	raw_imu->zgyro = mavlink_msg_raw_imu_get_zgyro(msg);
-	raw_imu->xmag = mavlink_msg_raw_imu_get_xmag(msg);
-	raw_imu->ymag = mavlink_msg_raw_imu_get_ymag(msg);
-	raw_imu->zmag = mavlink_msg_raw_imu_get_zmag(msg);
-#else
-	memcpy(raw_imu, _MAV_PAYLOAD(msg), 26);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_pressure.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_pressure.h
deleted file mode 100644
index b493b7e98..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_raw_pressure.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE RAW_PRESSURE PACKING
-
-#define MAVLINK_MSG_ID_RAW_PRESSURE 29
-
-typedef struct __mavlink_raw_pressure_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- int16_t press_abs; ///< Absolute pressure (raw)
- int16_t press_diff1; ///< Differential pressure 1 (raw)
- int16_t press_diff2; ///< Differential pressure 2 (raw)
- int16_t temperature; ///< Raw Temperature measurement (raw)
-} mavlink_raw_pressure_t;
-
-#define MAVLINK_MSG_ID_RAW_PRESSURE_LEN 16
-#define MAVLINK_MSG_ID_29_LEN 16
-
-
-
-#define MAVLINK_MESSAGE_INFO_RAW_PRESSURE { \
-	"RAW_PRESSURE", \
-	5, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_raw_pressure_t, usec) }, \
-         { "press_abs", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_pressure_t, press_abs) }, \
-         { "press_diff1", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_pressure_t, press_diff1) }, \
-         { "press_diff2", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_raw_pressure_t, press_diff2) }, \
-         { "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_raw_pressure_t, temperature) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a raw_pressure message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (raw)
- * @param press_diff1 Differential pressure 1 (raw)
- * @param press_diff2 Differential pressure 2 (raw)
- * @param temperature Raw Temperature measurement (raw)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_pressure_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, press_abs);
-	_mav_put_int16_t(buf, 10, press_diff1);
-	_mav_put_int16_t(buf, 12, press_diff2);
-	_mav_put_int16_t(buf, 14, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_raw_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff1 = press_diff1;
-	packet.press_diff2 = press_diff2;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_PRESSURE;
-	return mavlink_finalize_message(msg, system_id, component_id, 16);
-}
-
-/**
- * @brief Pack a raw_pressure message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (raw)
- * @param press_diff1 Differential pressure 1 (raw)
- * @param press_diff2 Differential pressure 2 (raw)
- * @param temperature Raw Temperature measurement (raw)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_pressure_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,int16_t press_abs,int16_t press_diff1,int16_t press_diff2,int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, press_abs);
-	_mav_put_int16_t(buf, 10, press_diff1);
-	_mav_put_int16_t(buf, 12, press_diff2);
-	_mav_put_int16_t(buf, 14, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_raw_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff1 = press_diff1;
-	packet.press_diff2 = press_diff2;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_PRESSURE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
-}
-
-/**
- * @brief Encode a raw_pressure struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param raw_pressure C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_raw_pressure_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_raw_pressure_t* raw_pressure)
-{
-	return mavlink_msg_raw_pressure_pack(system_id, component_id, msg, raw_pressure->usec, raw_pressure->press_abs, raw_pressure->press_diff1, raw_pressure->press_diff2, raw_pressure->temperature);
-}
-
-/**
- * @brief Send a raw_pressure message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (raw)
- * @param press_diff1 Differential pressure 1 (raw)
- * @param press_diff2 Differential pressure 2 (raw)
- * @param temperature Raw Temperature measurement (raw)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_raw_pressure_send(mavlink_channel_t chan, uint64_t usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, press_abs);
-	_mav_put_int16_t(buf, 10, press_diff1);
-	_mav_put_int16_t(buf, 12, press_diff2);
-	_mav_put_int16_t(buf, 14, temperature);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_PRESSURE, buf, 16);
-#else
-	mavlink_raw_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff1 = press_diff1;
-	packet.press_diff2 = press_diff2;
-	packet.temperature = temperature;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_PRESSURE, (const char *)&packet, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE RAW_PRESSURE UNPACKING
-
-
-/**
- * @brief Get field usec from raw_pressure message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_raw_pressure_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field press_abs from raw_pressure message
- *
- * @return Absolute pressure (raw)
- */
-static inline int16_t mavlink_msg_raw_pressure_get_press_abs(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field press_diff1 from raw_pressure message
- *
- * @return Differential pressure 1 (raw)
- */
-static inline int16_t mavlink_msg_raw_pressure_get_press_diff1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field press_diff2 from raw_pressure message
- *
- * @return Differential pressure 2 (raw)
- */
-static inline int16_t mavlink_msg_raw_pressure_get_press_diff2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field temperature from raw_pressure message
- *
- * @return Raw Temperature measurement (raw)
- */
-static inline int16_t mavlink_msg_raw_pressure_get_temperature(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Decode a raw_pressure message into a struct
- *
- * @param msg The message to decode
- * @param raw_pressure C-struct to decode the message contents into
- */
-static inline void mavlink_msg_raw_pressure_decode(const mavlink_message_t* msg, mavlink_raw_pressure_t* raw_pressure)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	raw_pressure->usec = mavlink_msg_raw_pressure_get_usec(msg);
-	raw_pressure->press_abs = mavlink_msg_raw_pressure_get_press_abs(msg);
-	raw_pressure->press_diff1 = mavlink_msg_raw_pressure_get_press_diff1(msg);
-	raw_pressure->press_diff2 = mavlink_msg_raw_pressure_get_press_diff2(msg);
-	raw_pressure->temperature = mavlink_msg_raw_pressure_get_temperature(msg);
-#else
-	memcpy(raw_pressure, _MAV_PAYLOAD(msg), 16);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_override.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_override.h
deleted file mode 100644
index 30e5a8f98..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_override.h
+++ /dev/null
@@ -1,342 +0,0 @@
-// MESSAGE RC_CHANNELS_OVERRIDE PACKING
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE 70
-
-typedef struct __mavlink_rc_channels_override_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t chan1_raw; ///< RC channel 1 value, in microseconds
- uint16_t chan2_raw; ///< RC channel 2 value, in microseconds
- uint16_t chan3_raw; ///< RC channel 3 value, in microseconds
- uint16_t chan4_raw; ///< RC channel 4 value, in microseconds
- uint16_t chan5_raw; ///< RC channel 5 value, in microseconds
- uint16_t chan6_raw; ///< RC channel 6 value, in microseconds
- uint16_t chan7_raw; ///< RC channel 7 value, in microseconds
- uint16_t chan8_raw; ///< RC channel 8 value, in microseconds
-} mavlink_rc_channels_override_t;
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE_LEN 18
-#define MAVLINK_MSG_ID_70_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE { \
-	"RC_CHANNELS_OVERRIDE", \
-	10, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_rc_channels_override_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_rc_channels_override_t, target_component) }, \
-         { "chan1_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_rc_channels_override_t, chan1_raw) }, \
-         { "chan2_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_rc_channels_override_t, chan2_raw) }, \
-         { "chan3_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_rc_channels_override_t, chan3_raw) }, \
-         { "chan4_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_rc_channels_override_t, chan4_raw) }, \
-         { "chan5_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_rc_channels_override_t, chan5_raw) }, \
-         { "chan6_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_rc_channels_override_t, chan6_raw) }, \
-         { "chan7_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 14, offsetof(mavlink_rc_channels_override_t, chan7_raw) }, \
-         { "chan8_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 16, offsetof(mavlink_rc_channels_override_t, chan8_raw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a rc_channels_override message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_override_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t chan1_raw, uint16_t chan2_raw, uint16_t chan3_raw, uint16_t chan4_raw, uint16_t chan5_raw, uint16_t chan6_raw, uint16_t chan7_raw, uint16_t chan8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, chan1_raw);
-	_mav_put_uint16_t(buf, 4, chan2_raw);
-	_mav_put_uint16_t(buf, 6, chan3_raw);
-	_mav_put_uint16_t(buf, 8, chan4_raw);
-	_mav_put_uint16_t(buf, 10, chan5_raw);
-	_mav_put_uint16_t(buf, 12, chan6_raw);
-	_mav_put_uint16_t(buf, 14, chan7_raw);
-	_mav_put_uint16_t(buf, 16, chan8_raw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_rc_channels_override_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a rc_channels_override message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_override_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t chan1_raw,uint16_t chan2_raw,uint16_t chan3_raw,uint16_t chan4_raw,uint16_t chan5_raw,uint16_t chan6_raw,uint16_t chan7_raw,uint16_t chan8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, chan1_raw);
-	_mav_put_uint16_t(buf, 4, chan2_raw);
-	_mav_put_uint16_t(buf, 6, chan3_raw);
-	_mav_put_uint16_t(buf, 8, chan4_raw);
-	_mav_put_uint16_t(buf, 10, chan5_raw);
-	_mav_put_uint16_t(buf, 12, chan6_raw);
-	_mav_put_uint16_t(buf, 14, chan7_raw);
-	_mav_put_uint16_t(buf, 16, chan8_raw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_rc_channels_override_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a rc_channels_override struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param rc_channels_override C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_rc_channels_override_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_rc_channels_override_t* rc_channels_override)
-{
-	return mavlink_msg_rc_channels_override_pack(system_id, component_id, msg, rc_channels_override->target_system, rc_channels_override->target_component, rc_channels_override->chan1_raw, rc_channels_override->chan2_raw, rc_channels_override->chan3_raw, rc_channels_override->chan4_raw, rc_channels_override->chan5_raw, rc_channels_override->chan6_raw, rc_channels_override->chan7_raw, rc_channels_override->chan8_raw);
-}
-
-/**
- * @brief Send a rc_channels_override message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_rc_channels_override_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t chan1_raw, uint16_t chan2_raw, uint16_t chan3_raw, uint16_t chan4_raw, uint16_t chan5_raw, uint16_t chan6_raw, uint16_t chan7_raw, uint16_t chan8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, chan1_raw);
-	_mav_put_uint16_t(buf, 4, chan2_raw);
-	_mav_put_uint16_t(buf, 6, chan3_raw);
-	_mav_put_uint16_t(buf, 8, chan4_raw);
-	_mav_put_uint16_t(buf, 10, chan5_raw);
-	_mav_put_uint16_t(buf, 12, chan6_raw);
-	_mav_put_uint16_t(buf, 14, chan7_raw);
-	_mav_put_uint16_t(buf, 16, chan8_raw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE, buf, 18);
-#else
-	mavlink_rc_channels_override_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE RC_CHANNELS_OVERRIDE UNPACKING
-
-
-/**
- * @brief Get field target_system from rc_channels_override message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_rc_channels_override_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from rc_channels_override message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_rc_channels_override_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field chan1_raw from rc_channels_override message
- *
- * @return RC channel 1 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan1_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field chan2_raw from rc_channels_override message
- *
- * @return RC channel 2 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan2_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field chan3_raw from rc_channels_override message
- *
- * @return RC channel 3 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan3_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  6);
-}
-
-/**
- * @brief Get field chan4_raw from rc_channels_override message
- *
- * @return RC channel 4 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan4_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Get field chan5_raw from rc_channels_override message
- *
- * @return RC channel 5 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan5_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Get field chan6_raw from rc_channels_override message
- *
- * @return RC channel 6 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan6_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  12);
-}
-
-/**
- * @brief Get field chan7_raw from rc_channels_override message
- *
- * @return RC channel 7 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan7_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  14);
-}
-
-/**
- * @brief Get field chan8_raw from rc_channels_override message
- *
- * @return RC channel 8 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_override_get_chan8_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  16);
-}
-
-/**
- * @brief Decode a rc_channels_override message into a struct
- *
- * @param msg The message to decode
- * @param rc_channels_override C-struct to decode the message contents into
- */
-static inline void mavlink_msg_rc_channels_override_decode(const mavlink_message_t* msg, mavlink_rc_channels_override_t* rc_channels_override)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	rc_channels_override->target_system = mavlink_msg_rc_channels_override_get_target_system(msg);
-	rc_channels_override->target_component = mavlink_msg_rc_channels_override_get_target_component(msg);
-	rc_channels_override->chan1_raw = mavlink_msg_rc_channels_override_get_chan1_raw(msg);
-	rc_channels_override->chan2_raw = mavlink_msg_rc_channels_override_get_chan2_raw(msg);
-	rc_channels_override->chan3_raw = mavlink_msg_rc_channels_override_get_chan3_raw(msg);
-	rc_channels_override->chan4_raw = mavlink_msg_rc_channels_override_get_chan4_raw(msg);
-	rc_channels_override->chan5_raw = mavlink_msg_rc_channels_override_get_chan5_raw(msg);
-	rc_channels_override->chan6_raw = mavlink_msg_rc_channels_override_get_chan6_raw(msg);
-	rc_channels_override->chan7_raw = mavlink_msg_rc_channels_override_get_chan7_raw(msg);
-	rc_channels_override->chan8_raw = mavlink_msg_rc_channels_override_get_chan8_raw(msg);
-#else
-	memcpy(rc_channels_override, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_raw.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_raw.h
deleted file mode 100644
index 855f7cced..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_raw.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE RC_CHANNELS_RAW PACKING
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_RAW 35
-
-typedef struct __mavlink_rc_channels_raw_t
-{
- uint16_t chan1_raw; ///< RC channel 1 value, in microseconds
- uint16_t chan2_raw; ///< RC channel 2 value, in microseconds
- uint16_t chan3_raw; ///< RC channel 3 value, in microseconds
- uint16_t chan4_raw; ///< RC channel 4 value, in microseconds
- uint16_t chan5_raw; ///< RC channel 5 value, in microseconds
- uint16_t chan6_raw; ///< RC channel 6 value, in microseconds
- uint16_t chan7_raw; ///< RC channel 7 value, in microseconds
- uint16_t chan8_raw; ///< RC channel 8 value, in microseconds
- uint8_t rssi; ///< Receive signal strength indicator, 0: 0%, 255: 100%
-} mavlink_rc_channels_raw_t;
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_RAW_LEN 17
-#define MAVLINK_MSG_ID_35_LEN 17
-
-
-
-#define MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW { \
-	"RC_CHANNELS_RAW", \
-	9, \
-	{  { "chan1_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_rc_channels_raw_t, chan1_raw) }, \
-         { "chan2_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_rc_channels_raw_t, chan2_raw) }, \
-         { "chan3_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_rc_channels_raw_t, chan3_raw) }, \
-         { "chan4_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_rc_channels_raw_t, chan4_raw) }, \
-         { "chan5_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_rc_channels_raw_t, chan5_raw) }, \
-         { "chan6_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_rc_channels_raw_t, chan6_raw) }, \
-         { "chan7_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_rc_channels_raw_t, chan7_raw) }, \
-         { "chan8_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 14, offsetof(mavlink_rc_channels_raw_t, chan8_raw) }, \
-         { "rssi", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_rc_channels_raw_t, rssi) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a rc_channels_raw message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t chan1_raw, uint16_t chan2_raw, uint16_t chan3_raw, uint16_t chan4_raw, uint16_t chan5_raw, uint16_t chan6_raw, uint16_t chan7_raw, uint16_t chan8_raw, uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_uint16_t(buf, 0, chan1_raw);
-	_mav_put_uint16_t(buf, 2, chan2_raw);
-	_mav_put_uint16_t(buf, 4, chan3_raw);
-	_mav_put_uint16_t(buf, 6, chan4_raw);
-	_mav_put_uint16_t(buf, 8, chan5_raw);
-	_mav_put_uint16_t(buf, 10, chan6_raw);
-	_mav_put_uint16_t(buf, 12, chan7_raw);
-	_mav_put_uint16_t(buf, 14, chan8_raw);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 17);
-#else
-	mavlink_rc_channels_raw_t packet;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-	packet.rssi = rssi;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 17);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_RAW;
-	return mavlink_finalize_message(msg, system_id, component_id, 17);
-}
-
-/**
- * @brief Pack a rc_channels_raw message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t chan1_raw,uint16_t chan2_raw,uint16_t chan3_raw,uint16_t chan4_raw,uint16_t chan5_raw,uint16_t chan6_raw,uint16_t chan7_raw,uint16_t chan8_raw,uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_uint16_t(buf, 0, chan1_raw);
-	_mav_put_uint16_t(buf, 2, chan2_raw);
-	_mav_put_uint16_t(buf, 4, chan3_raw);
-	_mav_put_uint16_t(buf, 6, chan4_raw);
-	_mav_put_uint16_t(buf, 8, chan5_raw);
-	_mav_put_uint16_t(buf, 10, chan6_raw);
-	_mav_put_uint16_t(buf, 12, chan7_raw);
-	_mav_put_uint16_t(buf, 14, chan8_raw);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 17);
-#else
-	mavlink_rc_channels_raw_t packet;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-	packet.rssi = rssi;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 17);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_RAW;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 17);
-}
-
-/**
- * @brief Encode a rc_channels_raw struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param rc_channels_raw C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_rc_channels_raw_t* rc_channels_raw)
-{
-	return mavlink_msg_rc_channels_raw_pack(system_id, component_id, msg, rc_channels_raw->chan1_raw, rc_channels_raw->chan2_raw, rc_channels_raw->chan3_raw, rc_channels_raw->chan4_raw, rc_channels_raw->chan5_raw, rc_channels_raw->chan6_raw, rc_channels_raw->chan7_raw, rc_channels_raw->chan8_raw, rc_channels_raw->rssi);
-}
-
-/**
- * @brief Send a rc_channels_raw message
- * @param chan MAVLink channel to send the message
- *
- * @param chan1_raw RC channel 1 value, in microseconds
- * @param chan2_raw RC channel 2 value, in microseconds
- * @param chan3_raw RC channel 3 value, in microseconds
- * @param chan4_raw RC channel 4 value, in microseconds
- * @param chan5_raw RC channel 5 value, in microseconds
- * @param chan6_raw RC channel 6 value, in microseconds
- * @param chan7_raw RC channel 7 value, in microseconds
- * @param chan8_raw RC channel 8 value, in microseconds
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_rc_channels_raw_send(mavlink_channel_t chan, uint16_t chan1_raw, uint16_t chan2_raw, uint16_t chan3_raw, uint16_t chan4_raw, uint16_t chan5_raw, uint16_t chan6_raw, uint16_t chan7_raw, uint16_t chan8_raw, uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_uint16_t(buf, 0, chan1_raw);
-	_mav_put_uint16_t(buf, 2, chan2_raw);
-	_mav_put_uint16_t(buf, 4, chan3_raw);
-	_mav_put_uint16_t(buf, 6, chan4_raw);
-	_mav_put_uint16_t(buf, 8, chan5_raw);
-	_mav_put_uint16_t(buf, 10, chan6_raw);
-	_mav_put_uint16_t(buf, 12, chan7_raw);
-	_mav_put_uint16_t(buf, 14, chan8_raw);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_RAW, buf, 17);
-#else
-	mavlink_rc_channels_raw_t packet;
-	packet.chan1_raw = chan1_raw;
-	packet.chan2_raw = chan2_raw;
-	packet.chan3_raw = chan3_raw;
-	packet.chan4_raw = chan4_raw;
-	packet.chan5_raw = chan5_raw;
-	packet.chan6_raw = chan6_raw;
-	packet.chan7_raw = chan7_raw;
-	packet.chan8_raw = chan8_raw;
-	packet.rssi = rssi;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_RAW, (const char *)&packet, 17);
-#endif
-}
-
-#endif
-
-// MESSAGE RC_CHANNELS_RAW UNPACKING
-
-
-/**
- * @brief Get field chan1_raw from rc_channels_raw message
- *
- * @return RC channel 1 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan1_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field chan2_raw from rc_channels_raw message
- *
- * @return RC channel 2 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan2_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field chan3_raw from rc_channels_raw message
- *
- * @return RC channel 3 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan3_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field chan4_raw from rc_channels_raw message
- *
- * @return RC channel 4 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan4_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  6);
-}
-
-/**
- * @brief Get field chan5_raw from rc_channels_raw message
- *
- * @return RC channel 5 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan5_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Get field chan6_raw from rc_channels_raw message
- *
- * @return RC channel 6 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan6_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Get field chan7_raw from rc_channels_raw message
- *
- * @return RC channel 7 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan7_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  12);
-}
-
-/**
- * @brief Get field chan8_raw from rc_channels_raw message
- *
- * @return RC channel 8 value, in microseconds
- */
-static inline uint16_t mavlink_msg_rc_channels_raw_get_chan8_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  14);
-}
-
-/**
- * @brief Get field rssi from rc_channels_raw message
- *
- * @return Receive signal strength indicator, 0: 0%, 255: 100%
- */
-static inline uint8_t mavlink_msg_rc_channels_raw_get_rssi(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  16);
-}
-
-/**
- * @brief Decode a rc_channels_raw message into a struct
- *
- * @param msg The message to decode
- * @param rc_channels_raw C-struct to decode the message contents into
- */
-static inline void mavlink_msg_rc_channels_raw_decode(const mavlink_message_t* msg, mavlink_rc_channels_raw_t* rc_channels_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	rc_channels_raw->chan1_raw = mavlink_msg_rc_channels_raw_get_chan1_raw(msg);
-	rc_channels_raw->chan2_raw = mavlink_msg_rc_channels_raw_get_chan2_raw(msg);
-	rc_channels_raw->chan3_raw = mavlink_msg_rc_channels_raw_get_chan3_raw(msg);
-	rc_channels_raw->chan4_raw = mavlink_msg_rc_channels_raw_get_chan4_raw(msg);
-	rc_channels_raw->chan5_raw = mavlink_msg_rc_channels_raw_get_chan5_raw(msg);
-	rc_channels_raw->chan6_raw = mavlink_msg_rc_channels_raw_get_chan6_raw(msg);
-	rc_channels_raw->chan7_raw = mavlink_msg_rc_channels_raw_get_chan7_raw(msg);
-	rc_channels_raw->chan8_raw = mavlink_msg_rc_channels_raw_get_chan8_raw(msg);
-	rc_channels_raw->rssi = mavlink_msg_rc_channels_raw_get_rssi(msg);
-#else
-	memcpy(rc_channels_raw, _MAV_PAYLOAD(msg), 17);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_scaled.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_scaled.h
deleted file mode 100644
index 49df14a7a..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_rc_channels_scaled.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE RC_CHANNELS_SCALED PACKING
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_SCALED 36
-
-typedef struct __mavlink_rc_channels_scaled_t
-{
- int16_t chan1_scaled; ///< RC channel 1 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan2_scaled; ///< RC channel 2 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan3_scaled; ///< RC channel 3 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan4_scaled; ///< RC channel 4 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan5_scaled; ///< RC channel 5 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan6_scaled; ///< RC channel 6 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan7_scaled; ///< RC channel 7 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- int16_t chan8_scaled; ///< RC channel 8 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- uint8_t rssi; ///< Receive signal strength indicator, 0: 0%, 255: 100%
-} mavlink_rc_channels_scaled_t;
-
-#define MAVLINK_MSG_ID_RC_CHANNELS_SCALED_LEN 17
-#define MAVLINK_MSG_ID_36_LEN 17
-
-
-
-#define MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED { \
-	"RC_CHANNELS_SCALED", \
-	9, \
-	{  { "chan1_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 0, offsetof(mavlink_rc_channels_scaled_t, chan1_scaled) }, \
-         { "chan2_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 2, offsetof(mavlink_rc_channels_scaled_t, chan2_scaled) }, \
-         { "chan3_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 4, offsetof(mavlink_rc_channels_scaled_t, chan3_scaled) }, \
-         { "chan4_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 6, offsetof(mavlink_rc_channels_scaled_t, chan4_scaled) }, \
-         { "chan5_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_rc_channels_scaled_t, chan5_scaled) }, \
-         { "chan6_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_rc_channels_scaled_t, chan6_scaled) }, \
-         { "chan7_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_rc_channels_scaled_t, chan7_scaled) }, \
-         { "chan8_scaled", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_rc_channels_scaled_t, chan8_scaled) }, \
-         { "rssi", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_rc_channels_scaled_t, rssi) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a rc_channels_scaled message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param chan1_scaled RC channel 1 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan2_scaled RC channel 2 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan3_scaled RC channel 3 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan4_scaled RC channel 4 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan5_scaled RC channel 5 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan6_scaled RC channel 6 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan7_scaled RC channel 7 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan8_scaled RC channel 8 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_scaled_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       int16_t chan1_scaled, int16_t chan2_scaled, int16_t chan3_scaled, int16_t chan4_scaled, int16_t chan5_scaled, int16_t chan6_scaled, int16_t chan7_scaled, int16_t chan8_scaled, uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_int16_t(buf, 0, chan1_scaled);
-	_mav_put_int16_t(buf, 2, chan2_scaled);
-	_mav_put_int16_t(buf, 4, chan3_scaled);
-	_mav_put_int16_t(buf, 6, chan4_scaled);
-	_mav_put_int16_t(buf, 8, chan5_scaled);
-	_mav_put_int16_t(buf, 10, chan6_scaled);
-	_mav_put_int16_t(buf, 12, chan7_scaled);
-	_mav_put_int16_t(buf, 14, chan8_scaled);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 17);
-#else
-	mavlink_rc_channels_scaled_t packet;
-	packet.chan1_scaled = chan1_scaled;
-	packet.chan2_scaled = chan2_scaled;
-	packet.chan3_scaled = chan3_scaled;
-	packet.chan4_scaled = chan4_scaled;
-	packet.chan5_scaled = chan5_scaled;
-	packet.chan6_scaled = chan6_scaled;
-	packet.chan7_scaled = chan7_scaled;
-	packet.chan8_scaled = chan8_scaled;
-	packet.rssi = rssi;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 17);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_SCALED;
-	return mavlink_finalize_message(msg, system_id, component_id, 17);
-}
-
-/**
- * @brief Pack a rc_channels_scaled message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param chan1_scaled RC channel 1 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan2_scaled RC channel 2 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan3_scaled RC channel 3 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan4_scaled RC channel 4 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan5_scaled RC channel 5 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan6_scaled RC channel 6 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan7_scaled RC channel 7 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan8_scaled RC channel 8 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_rc_channels_scaled_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           int16_t chan1_scaled,int16_t chan2_scaled,int16_t chan3_scaled,int16_t chan4_scaled,int16_t chan5_scaled,int16_t chan6_scaled,int16_t chan7_scaled,int16_t chan8_scaled,uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_int16_t(buf, 0, chan1_scaled);
-	_mav_put_int16_t(buf, 2, chan2_scaled);
-	_mav_put_int16_t(buf, 4, chan3_scaled);
-	_mav_put_int16_t(buf, 6, chan4_scaled);
-	_mav_put_int16_t(buf, 8, chan5_scaled);
-	_mav_put_int16_t(buf, 10, chan6_scaled);
-	_mav_put_int16_t(buf, 12, chan7_scaled);
-	_mav_put_int16_t(buf, 14, chan8_scaled);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 17);
-#else
-	mavlink_rc_channels_scaled_t packet;
-	packet.chan1_scaled = chan1_scaled;
-	packet.chan2_scaled = chan2_scaled;
-	packet.chan3_scaled = chan3_scaled;
-	packet.chan4_scaled = chan4_scaled;
-	packet.chan5_scaled = chan5_scaled;
-	packet.chan6_scaled = chan6_scaled;
-	packet.chan7_scaled = chan7_scaled;
-	packet.chan8_scaled = chan8_scaled;
-	packet.rssi = rssi;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 17);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RC_CHANNELS_SCALED;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 17);
-}
-
-/**
- * @brief Encode a rc_channels_scaled struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param rc_channels_scaled C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_rc_channels_scaled_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_rc_channels_scaled_t* rc_channels_scaled)
-{
-	return mavlink_msg_rc_channels_scaled_pack(system_id, component_id, msg, rc_channels_scaled->chan1_scaled, rc_channels_scaled->chan2_scaled, rc_channels_scaled->chan3_scaled, rc_channels_scaled->chan4_scaled, rc_channels_scaled->chan5_scaled, rc_channels_scaled->chan6_scaled, rc_channels_scaled->chan7_scaled, rc_channels_scaled->chan8_scaled, rc_channels_scaled->rssi);
-}
-
-/**
- * @brief Send a rc_channels_scaled message
- * @param chan MAVLink channel to send the message
- *
- * @param chan1_scaled RC channel 1 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan2_scaled RC channel 2 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan3_scaled RC channel 3 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan4_scaled RC channel 4 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan5_scaled RC channel 5 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan6_scaled RC channel 6 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan7_scaled RC channel 7 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param chan8_scaled RC channel 8 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- * @param rssi Receive signal strength indicator, 0: 0%, 255: 100%
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_rc_channels_scaled_send(mavlink_channel_t chan, int16_t chan1_scaled, int16_t chan2_scaled, int16_t chan3_scaled, int16_t chan4_scaled, int16_t chan5_scaled, int16_t chan6_scaled, int16_t chan7_scaled, int16_t chan8_scaled, uint8_t rssi)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[17];
-	_mav_put_int16_t(buf, 0, chan1_scaled);
-	_mav_put_int16_t(buf, 2, chan2_scaled);
-	_mav_put_int16_t(buf, 4, chan3_scaled);
-	_mav_put_int16_t(buf, 6, chan4_scaled);
-	_mav_put_int16_t(buf, 8, chan5_scaled);
-	_mav_put_int16_t(buf, 10, chan6_scaled);
-	_mav_put_int16_t(buf, 12, chan7_scaled);
-	_mav_put_int16_t(buf, 14, chan8_scaled);
-	_mav_put_uint8_t(buf, 16, rssi);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_SCALED, buf, 17);
-#else
-	mavlink_rc_channels_scaled_t packet;
-	packet.chan1_scaled = chan1_scaled;
-	packet.chan2_scaled = chan2_scaled;
-	packet.chan3_scaled = chan3_scaled;
-	packet.chan4_scaled = chan4_scaled;
-	packet.chan5_scaled = chan5_scaled;
-	packet.chan6_scaled = chan6_scaled;
-	packet.chan7_scaled = chan7_scaled;
-	packet.chan8_scaled = chan8_scaled;
-	packet.rssi = rssi;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RC_CHANNELS_SCALED, (const char *)&packet, 17);
-#endif
-}
-
-#endif
-
-// MESSAGE RC_CHANNELS_SCALED UNPACKING
-
-
-/**
- * @brief Get field chan1_scaled from rc_channels_scaled message
- *
- * @return RC channel 1 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan1_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  0);
-}
-
-/**
- * @brief Get field chan2_scaled from rc_channels_scaled message
- *
- * @return RC channel 2 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan2_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  2);
-}
-
-/**
- * @brief Get field chan3_scaled from rc_channels_scaled message
- *
- * @return RC channel 3 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan3_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  4);
-}
-
-/**
- * @brief Get field chan4_scaled from rc_channels_scaled message
- *
- * @return RC channel 4 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan4_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  6);
-}
-
-/**
- * @brief Get field chan5_scaled from rc_channels_scaled message
- *
- * @return RC channel 5 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan5_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field chan6_scaled from rc_channels_scaled message
- *
- * @return RC channel 6 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan6_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field chan7_scaled from rc_channels_scaled message
- *
- * @return RC channel 7 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan7_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field chan8_scaled from rc_channels_scaled message
- *
- * @return RC channel 8 value scaled, (-100%) -10000, (0%) 0, (100%) 10000
- */
-static inline int16_t mavlink_msg_rc_channels_scaled_get_chan8_scaled(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field rssi from rc_channels_scaled message
- *
- * @return Receive signal strength indicator, 0: 0%, 255: 100%
- */
-static inline uint8_t mavlink_msg_rc_channels_scaled_get_rssi(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  16);
-}
-
-/**
- * @brief Decode a rc_channels_scaled message into a struct
- *
- * @param msg The message to decode
- * @param rc_channels_scaled C-struct to decode the message contents into
- */
-static inline void mavlink_msg_rc_channels_scaled_decode(const mavlink_message_t* msg, mavlink_rc_channels_scaled_t* rc_channels_scaled)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	rc_channels_scaled->chan1_scaled = mavlink_msg_rc_channels_scaled_get_chan1_scaled(msg);
-	rc_channels_scaled->chan2_scaled = mavlink_msg_rc_channels_scaled_get_chan2_scaled(msg);
-	rc_channels_scaled->chan3_scaled = mavlink_msg_rc_channels_scaled_get_chan3_scaled(msg);
-	rc_channels_scaled->chan4_scaled = mavlink_msg_rc_channels_scaled_get_chan4_scaled(msg);
-	rc_channels_scaled->chan5_scaled = mavlink_msg_rc_channels_scaled_get_chan5_scaled(msg);
-	rc_channels_scaled->chan6_scaled = mavlink_msg_rc_channels_scaled_get_chan6_scaled(msg);
-	rc_channels_scaled->chan7_scaled = mavlink_msg_rc_channels_scaled_get_chan7_scaled(msg);
-	rc_channels_scaled->chan8_scaled = mavlink_msg_rc_channels_scaled_get_chan8_scaled(msg);
-	rc_channels_scaled->rssi = mavlink_msg_rc_channels_scaled_get_rssi(msg);
-#else
-	memcpy(rc_channels_scaled, _MAV_PAYLOAD(msg), 17);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_request_data_stream.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_request_data_stream.h
deleted file mode 100644
index e80473aa1..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_request_data_stream.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE REQUEST_DATA_STREAM PACKING
-
-#define MAVLINK_MSG_ID_REQUEST_DATA_STREAM 66
-
-typedef struct __mavlink_request_data_stream_t
-{
- uint8_t target_system; ///< The target requested to send the message stream.
- uint8_t target_component; ///< The target requested to send the message stream.
- uint8_t req_stream_id; ///< The ID of the requested message type
- uint16_t req_message_rate; ///< Update rate in Hertz
- uint8_t start_stop; ///< 1 to start sending, 0 to stop sending.
-} mavlink_request_data_stream_t;
-
-#define MAVLINK_MSG_ID_REQUEST_DATA_STREAM_LEN 6
-#define MAVLINK_MSG_ID_66_LEN 6
-
-
-
-#define MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM { \
-	"REQUEST_DATA_STREAM", \
-	5, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_request_data_stream_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_request_data_stream_t, target_component) }, \
-         { "req_stream_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_request_data_stream_t, req_stream_id) }, \
-         { "req_message_rate", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_request_data_stream_t, req_message_rate) }, \
-         { "start_stop", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_request_data_stream_t, start_stop) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a request_data_stream message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system The target requested to send the message stream.
- * @param target_component The target requested to send the message stream.
- * @param req_stream_id The ID of the requested message type
- * @param req_message_rate Update rate in Hertz
- * @param start_stop 1 to start sending, 0 to stop sending.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_request_data_stream_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t req_stream_id, uint16_t req_message_rate, uint8_t start_stop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, req_stream_id);
-	_mav_put_uint16_t(buf, 3, req_message_rate);
-	_mav_put_uint8_t(buf, 5, start_stop);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_request_data_stream_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.req_stream_id = req_stream_id;
-	packet.req_message_rate = req_message_rate;
-	packet.start_stop = start_stop;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_REQUEST_DATA_STREAM;
-	return mavlink_finalize_message(msg, system_id, component_id, 6);
-}
-
-/**
- * @brief Pack a request_data_stream message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system The target requested to send the message stream.
- * @param target_component The target requested to send the message stream.
- * @param req_stream_id The ID of the requested message type
- * @param req_message_rate Update rate in Hertz
- * @param start_stop 1 to start sending, 0 to stop sending.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_request_data_stream_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t req_stream_id,uint16_t req_message_rate,uint8_t start_stop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, req_stream_id);
-	_mav_put_uint16_t(buf, 3, req_message_rate);
-	_mav_put_uint8_t(buf, 5, start_stop);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_request_data_stream_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.req_stream_id = req_stream_id;
-	packet.req_message_rate = req_message_rate;
-	packet.start_stop = start_stop;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_REQUEST_DATA_STREAM;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 6);
-}
-
-/**
- * @brief Encode a request_data_stream struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param request_data_stream C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_request_data_stream_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_request_data_stream_t* request_data_stream)
-{
-	return mavlink_msg_request_data_stream_pack(system_id, component_id, msg, request_data_stream->target_system, request_data_stream->target_component, request_data_stream->req_stream_id, request_data_stream->req_message_rate, request_data_stream->start_stop);
-}
-
-/**
- * @brief Send a request_data_stream message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system The target requested to send the message stream.
- * @param target_component The target requested to send the message stream.
- * @param req_stream_id The ID of the requested message type
- * @param req_message_rate Update rate in Hertz
- * @param start_stop 1 to start sending, 0 to stop sending.
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_request_data_stream_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t req_stream_id, uint16_t req_message_rate, uint8_t start_stop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, req_stream_id);
-	_mav_put_uint16_t(buf, 3, req_message_rate);
-	_mav_put_uint8_t(buf, 5, start_stop);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_REQUEST_DATA_STREAM, buf, 6);
-#else
-	mavlink_request_data_stream_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.req_stream_id = req_stream_id;
-	packet.req_message_rate = req_message_rate;
-	packet.start_stop = start_stop;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_REQUEST_DATA_STREAM, (const char *)&packet, 6);
-#endif
-}
-
-#endif
-
-// MESSAGE REQUEST_DATA_STREAM UNPACKING
-
-
-/**
- * @brief Get field target_system from request_data_stream message
- *
- * @return The target requested to send the message stream.
- */
-static inline uint8_t mavlink_msg_request_data_stream_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from request_data_stream message
- *
- * @return The target requested to send the message stream.
- */
-static inline uint8_t mavlink_msg_request_data_stream_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field req_stream_id from request_data_stream message
- *
- * @return The ID of the requested message type
- */
-static inline uint8_t mavlink_msg_request_data_stream_get_req_stream_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field req_message_rate from request_data_stream message
- *
- * @return Update rate in Hertz
- */
-static inline uint16_t mavlink_msg_request_data_stream_get_req_message_rate(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field start_stop from request_data_stream message
- *
- * @return 1 to start sending, 0 to stop sending.
- */
-static inline uint8_t mavlink_msg_request_data_stream_get_start_stop(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Decode a request_data_stream message into a struct
- *
- * @param msg The message to decode
- * @param request_data_stream C-struct to decode the message contents into
- */
-static inline void mavlink_msg_request_data_stream_decode(const mavlink_message_t* msg, mavlink_request_data_stream_t* request_data_stream)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	request_data_stream->target_system = mavlink_msg_request_data_stream_get_target_system(msg);
-	request_data_stream->target_component = mavlink_msg_request_data_stream_get_target_component(msg);
-	request_data_stream->req_stream_id = mavlink_msg_request_data_stream_get_req_stream_id(msg);
-	request_data_stream->req_message_rate = mavlink_msg_request_data_stream_get_req_message_rate(msg);
-	request_data_stream->start_stop = mavlink_msg_request_data_stream_get_start_stop(msg);
-#else
-	memcpy(request_data_stream, _MAV_PAYLOAD(msg), 6);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h
deleted file mode 100644
index b344f3aa2..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT PACKING
-
-#define MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT 58
-
-typedef struct __mavlink_roll_pitch_yaw_speed_thrust_setpoint_t
-{
- uint64_t time_us; ///< Timestamp in micro seconds since unix epoch
- float roll_speed; ///< Desired roll angular speed in rad/s
- float pitch_speed; ///< Desired pitch angular speed in rad/s
- float yaw_speed; ///< Desired yaw angular speed in rad/s
- float thrust; ///< Collective thrust, normalized to 0 .. 1
-} mavlink_roll_pitch_yaw_speed_thrust_setpoint_t;
-
-#define MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT_LEN 24
-#define MAVLINK_MSG_ID_58_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT { \
-	"ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT", \
-	5, \
-	{  { "time_us", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_roll_pitch_yaw_speed_thrust_setpoint_t, time_us) }, \
-         { "roll_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_roll_pitch_yaw_speed_thrust_setpoint_t, roll_speed) }, \
-         { "pitch_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_roll_pitch_yaw_speed_thrust_setpoint_t, pitch_speed) }, \
-         { "yaw_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_roll_pitch_yaw_speed_thrust_setpoint_t, yaw_speed) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_roll_pitch_yaw_speed_thrust_setpoint_t, thrust) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a roll_pitch_yaw_speed_thrust_setpoint message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t time_us, float roll_speed, float pitch_speed, float yaw_speed, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_speed);
-	_mav_put_float(buf, 12, pitch_speed);
-	_mav_put_float(buf, 16, yaw_speed);
-	_mav_put_float(buf, 20, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_roll_pitch_yaw_speed_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 24);
-}
-
-/**
- * @brief Pack a roll_pitch_yaw_speed_thrust_setpoint message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t time_us,float roll_speed,float pitch_speed,float yaw_speed,float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_speed);
-	_mav_put_float(buf, 12, pitch_speed);
-	_mav_put_float(buf, 16, yaw_speed);
-	_mav_put_float(buf, 20, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_roll_pitch_yaw_speed_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24);
-}
-
-/**
- * @brief Encode a roll_pitch_yaw_speed_thrust_setpoint struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param roll_pitch_yaw_speed_thrust_setpoint C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_roll_pitch_yaw_speed_thrust_setpoint_t* roll_pitch_yaw_speed_thrust_setpoint)
-{
-	return mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_pack(system_id, component_id, msg, roll_pitch_yaw_speed_thrust_setpoint->time_us, roll_pitch_yaw_speed_thrust_setpoint->roll_speed, roll_pitch_yaw_speed_thrust_setpoint->pitch_speed, roll_pitch_yaw_speed_thrust_setpoint->yaw_speed, roll_pitch_yaw_speed_thrust_setpoint->thrust);
-}
-
-/**
- * @brief Send a roll_pitch_yaw_speed_thrust_setpoint message
- * @param chan MAVLink channel to send the message
- *
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_send(mavlink_channel_t chan, uint64_t time_us, float roll_speed, float pitch_speed, float yaw_speed, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll_speed);
-	_mav_put_float(buf, 12, pitch_speed);
-	_mav_put_float(buf, 16, yaw_speed);
-	_mav_put_float(buf, 20, thrust);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, buf, 24);
-#else
-	mavlink_roll_pitch_yaw_speed_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, (const char *)&packet, 24);
-#endif
-}
-
-#endif
-
-// MESSAGE ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT UNPACKING
-
-
-/**
- * @brief Get field time_us from roll_pitch_yaw_speed_thrust_setpoint message
- *
- * @return Timestamp in micro seconds since unix epoch
- */
-static inline uint64_t mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_time_us(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field roll_speed from roll_pitch_yaw_speed_thrust_setpoint message
- *
- * @return Desired roll angular speed in rad/s
- */
-static inline float mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_roll_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field pitch_speed from roll_pitch_yaw_speed_thrust_setpoint message
- *
- * @return Desired pitch angular speed in rad/s
- */
-static inline float mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_pitch_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw_speed from roll_pitch_yaw_speed_thrust_setpoint message
- *
- * @return Desired yaw angular speed in rad/s
- */
-static inline float mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_yaw_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field thrust from roll_pitch_yaw_speed_thrust_setpoint message
- *
- * @return Collective thrust, normalized to 0 .. 1
- */
-static inline float mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a roll_pitch_yaw_speed_thrust_setpoint message into a struct
- *
- * @param msg The message to decode
- * @param roll_pitch_yaw_speed_thrust_setpoint C-struct to decode the message contents into
- */
-static inline void mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(const mavlink_message_t* msg, mavlink_roll_pitch_yaw_speed_thrust_setpoint_t* roll_pitch_yaw_speed_thrust_setpoint)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	roll_pitch_yaw_speed_thrust_setpoint->time_us = mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_time_us(msg);
-	roll_pitch_yaw_speed_thrust_setpoint->roll_speed = mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_roll_speed(msg);
-	roll_pitch_yaw_speed_thrust_setpoint->pitch_speed = mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_pitch_speed(msg);
-	roll_pitch_yaw_speed_thrust_setpoint->yaw_speed = mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_yaw_speed(msg);
-	roll_pitch_yaw_speed_thrust_setpoint->thrust = mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_get_thrust(msg);
-#else
-	memcpy(roll_pitch_yaw_speed_thrust_setpoint, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_thrust_setpoint.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_thrust_setpoint.h
deleted file mode 100644
index 16155f134..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_thrust_setpoint.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE ROLL_PITCH_YAW_THRUST_SETPOINT PACKING
-
-#define MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT 57
-
-typedef struct __mavlink_roll_pitch_yaw_thrust_setpoint_t
-{
- uint64_t time_us; ///< Timestamp in micro seconds since unix epoch
- float roll; ///< Desired roll angle in radians
- float pitch; ///< Desired pitch angle in radians
- float yaw; ///< Desired yaw angle in radians
- float thrust; ///< Collective thrust, normalized to 0 .. 1
-} mavlink_roll_pitch_yaw_thrust_setpoint_t;
-
-#define MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT_LEN 24
-#define MAVLINK_MSG_ID_57_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT { \
-	"ROLL_PITCH_YAW_THRUST_SETPOINT", \
-	5, \
-	{  { "time_us", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_roll_pitch_yaw_thrust_setpoint_t, time_us) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_roll_pitch_yaw_thrust_setpoint_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_roll_pitch_yaw_thrust_setpoint_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_roll_pitch_yaw_thrust_setpoint_t, yaw) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_roll_pitch_yaw_thrust_setpoint_t, thrust) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a roll_pitch_yaw_thrust_setpoint message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_thrust_setpoint_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t time_us, float roll, float pitch, float yaw, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_roll_pitch_yaw_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 24);
-}
-
-/**
- * @brief Pack a roll_pitch_yaw_thrust_setpoint message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_thrust_setpoint_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t time_us,float roll,float pitch,float yaw,float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_roll_pitch_yaw_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24);
-}
-
-/**
- * @brief Encode a roll_pitch_yaw_thrust_setpoint struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param roll_pitch_yaw_thrust_setpoint C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_roll_pitch_yaw_thrust_setpoint_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_roll_pitch_yaw_thrust_setpoint_t* roll_pitch_yaw_thrust_setpoint)
-{
-	return mavlink_msg_roll_pitch_yaw_thrust_setpoint_pack(system_id, component_id, msg, roll_pitch_yaw_thrust_setpoint->time_us, roll_pitch_yaw_thrust_setpoint->roll, roll_pitch_yaw_thrust_setpoint->pitch, roll_pitch_yaw_thrust_setpoint->yaw, roll_pitch_yaw_thrust_setpoint->thrust);
-}
-
-/**
- * @brief Send a roll_pitch_yaw_thrust_setpoint message
- * @param chan MAVLink channel to send the message
- *
- * @param time_us Timestamp in micro seconds since unix epoch
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_roll_pitch_yaw_thrust_setpoint_send(mavlink_channel_t chan, uint64_t time_us, float roll, float pitch, float yaw, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_uint64_t(buf, 0, time_us);
-	_mav_put_float(buf, 8, roll);
-	_mav_put_float(buf, 12, pitch);
-	_mav_put_float(buf, 16, yaw);
-	_mav_put_float(buf, 20, thrust);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT, buf, 24);
-#else
-	mavlink_roll_pitch_yaw_thrust_setpoint_t packet;
-	packet.time_us = time_us;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROLL_PITCH_YAW_THRUST_SETPOINT, (const char *)&packet, 24);
-#endif
-}
-
-#endif
-
-// MESSAGE ROLL_PITCH_YAW_THRUST_SETPOINT UNPACKING
-
-
-/**
- * @brief Get field time_us from roll_pitch_yaw_thrust_setpoint message
- *
- * @return Timestamp in micro seconds since unix epoch
- */
-static inline uint64_t mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_time_us(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field roll from roll_pitch_yaw_thrust_setpoint message
- *
- * @return Desired roll angle in radians
- */
-static inline float mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field pitch from roll_pitch_yaw_thrust_setpoint message
- *
- * @return Desired pitch angle in radians
- */
-static inline float mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw from roll_pitch_yaw_thrust_setpoint message
- *
- * @return Desired yaw angle in radians
- */
-static inline float mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field thrust from roll_pitch_yaw_thrust_setpoint message
- *
- * @return Collective thrust, normalized to 0 .. 1
- */
-static inline float mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a roll_pitch_yaw_thrust_setpoint message into a struct
- *
- * @param msg The message to decode
- * @param roll_pitch_yaw_thrust_setpoint C-struct to decode the message contents into
- */
-static inline void mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(const mavlink_message_t* msg, mavlink_roll_pitch_yaw_thrust_setpoint_t* roll_pitch_yaw_thrust_setpoint)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	roll_pitch_yaw_thrust_setpoint->time_us = mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_time_us(msg);
-	roll_pitch_yaw_thrust_setpoint->roll = mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_roll(msg);
-	roll_pitch_yaw_thrust_setpoint->pitch = mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_pitch(msg);
-	roll_pitch_yaw_thrust_setpoint->yaw = mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_yaw(msg);
-	roll_pitch_yaw_thrust_setpoint->thrust = mavlink_msg_roll_pitch_yaw_thrust_setpoint_get_thrust(msg);
-#else
-	memcpy(roll_pitch_yaw_thrust_setpoint, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_allowed_area.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_allowed_area.h
deleted file mode 100644
index 07b91fd0e..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_allowed_area.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE SAFETY_ALLOWED_AREA PACKING
-
-#define MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA 54
-
-typedef struct __mavlink_safety_allowed_area_t
-{
- uint8_t frame; ///< Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- float p1x; ///< x position 1 / Latitude 1
- float p1y; ///< y position 1 / Longitude 1
- float p1z; ///< z position 1 / Altitude 1
- float p2x; ///< x position 2 / Latitude 2
- float p2y; ///< y position 2 / Longitude 2
- float p2z; ///< z position 2 / Altitude 2
-} mavlink_safety_allowed_area_t;
-
-#define MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA_LEN 25
-#define MAVLINK_MSG_ID_54_LEN 25
-
-
-
-#define MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA { \
-	"SAFETY_ALLOWED_AREA", \
-	7, \
-	{  { "frame", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_safety_allowed_area_t, frame) }, \
-         { "p1x", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_safety_allowed_area_t, p1x) }, \
-         { "p1y", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_safety_allowed_area_t, p1y) }, \
-         { "p1z", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_safety_allowed_area_t, p1z) }, \
-         { "p2x", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_safety_allowed_area_t, p2x) }, \
-         { "p2y", NULL, MAVLINK_TYPE_FLOAT, 0, 17, offsetof(mavlink_safety_allowed_area_t, p2y) }, \
-         { "p2z", NULL, MAVLINK_TYPE_FLOAT, 0, 21, offsetof(mavlink_safety_allowed_area_t, p2z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a safety_allowed_area message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_safety_allowed_area_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t frame, float p1x, float p1y, float p1z, float p2x, float p2y, float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[25];
-	_mav_put_uint8_t(buf, 0, frame);
-	_mav_put_float(buf, 1, p1x);
-	_mav_put_float(buf, 5, p1y);
-	_mav_put_float(buf, 9, p1z);
-	_mav_put_float(buf, 13, p2x);
-	_mav_put_float(buf, 17, p2y);
-	_mav_put_float(buf, 21, p2z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 25);
-#else
-	mavlink_safety_allowed_area_t packet;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 25);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA;
-	return mavlink_finalize_message(msg, system_id, component_id, 25);
-}
-
-/**
- * @brief Pack a safety_allowed_area message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_safety_allowed_area_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t frame,float p1x,float p1y,float p1z,float p2x,float p2y,float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[25];
-	_mav_put_uint8_t(buf, 0, frame);
-	_mav_put_float(buf, 1, p1x);
-	_mav_put_float(buf, 5, p1y);
-	_mav_put_float(buf, 9, p1z);
-	_mav_put_float(buf, 13, p2x);
-	_mav_put_float(buf, 17, p2y);
-	_mav_put_float(buf, 21, p2z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 25);
-#else
-	mavlink_safety_allowed_area_t packet;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 25);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 25);
-}
-
-/**
- * @brief Encode a safety_allowed_area struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param safety_allowed_area C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_safety_allowed_area_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_safety_allowed_area_t* safety_allowed_area)
-{
-	return mavlink_msg_safety_allowed_area_pack(system_id, component_id, msg, safety_allowed_area->frame, safety_allowed_area->p1x, safety_allowed_area->p1y, safety_allowed_area->p1z, safety_allowed_area->p2x, safety_allowed_area->p2y, safety_allowed_area->p2z);
-}
-
-/**
- * @brief Send a safety_allowed_area message
- * @param chan MAVLink channel to send the message
- *
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_safety_allowed_area_send(mavlink_channel_t chan, uint8_t frame, float p1x, float p1y, float p1z, float p2x, float p2y, float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[25];
-	_mav_put_uint8_t(buf, 0, frame);
-	_mav_put_float(buf, 1, p1x);
-	_mav_put_float(buf, 5, p1y);
-	_mav_put_float(buf, 9, p1z);
-	_mav_put_float(buf, 13, p2x);
-	_mav_put_float(buf, 17, p2y);
-	_mav_put_float(buf, 21, p2z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA, buf, 25);
-#else
-	mavlink_safety_allowed_area_t packet;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA, (const char *)&packet, 25);
-#endif
-}
-
-#endif
-
-// MESSAGE SAFETY_ALLOWED_AREA UNPACKING
-
-
-/**
- * @brief Get field frame from safety_allowed_area message
- *
- * @return Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- */
-static inline uint8_t mavlink_msg_safety_allowed_area_get_frame(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field p1x from safety_allowed_area message
- *
- * @return x position 1 / Latitude 1
- */
-static inline float mavlink_msg_safety_allowed_area_get_p1x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Get field p1y from safety_allowed_area message
- *
- * @return y position 1 / Longitude 1
- */
-static inline float mavlink_msg_safety_allowed_area_get_p1y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field p1z from safety_allowed_area message
- *
- * @return z position 1 / Altitude 1
- */
-static inline float mavlink_msg_safety_allowed_area_get_p1z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field p2x from safety_allowed_area message
- *
- * @return x position 2 / Latitude 2
- */
-static inline float mavlink_msg_safety_allowed_area_get_p2x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field p2y from safety_allowed_area message
- *
- * @return y position 2 / Longitude 2
- */
-static inline float mavlink_msg_safety_allowed_area_get_p2y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  17);
-}
-
-/**
- * @brief Get field p2z from safety_allowed_area message
- *
- * @return z position 2 / Altitude 2
- */
-static inline float mavlink_msg_safety_allowed_area_get_p2z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  21);
-}
-
-/**
- * @brief Decode a safety_allowed_area message into a struct
- *
- * @param msg The message to decode
- * @param safety_allowed_area C-struct to decode the message contents into
- */
-static inline void mavlink_msg_safety_allowed_area_decode(const mavlink_message_t* msg, mavlink_safety_allowed_area_t* safety_allowed_area)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	safety_allowed_area->frame = mavlink_msg_safety_allowed_area_get_frame(msg);
-	safety_allowed_area->p1x = mavlink_msg_safety_allowed_area_get_p1x(msg);
-	safety_allowed_area->p1y = mavlink_msg_safety_allowed_area_get_p1y(msg);
-	safety_allowed_area->p1z = mavlink_msg_safety_allowed_area_get_p1z(msg);
-	safety_allowed_area->p2x = mavlink_msg_safety_allowed_area_get_p2x(msg);
-	safety_allowed_area->p2y = mavlink_msg_safety_allowed_area_get_p2y(msg);
-	safety_allowed_area->p2z = mavlink_msg_safety_allowed_area_get_p2z(msg);
-#else
-	memcpy(safety_allowed_area, _MAV_PAYLOAD(msg), 25);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_set_allowed_area.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_set_allowed_area.h
deleted file mode 100644
index 3c122227a..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_safety_set_allowed_area.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE SAFETY_SET_ALLOWED_AREA PACKING
-
-#define MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA 53
-
-typedef struct __mavlink_safety_set_allowed_area_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t frame; ///< Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- float p1x; ///< x position 1 / Latitude 1
- float p1y; ///< y position 1 / Longitude 1
- float p1z; ///< z position 1 / Altitude 1
- float p2x; ///< x position 2 / Latitude 2
- float p2y; ///< y position 2 / Longitude 2
- float p2z; ///< z position 2 / Altitude 2
-} mavlink_safety_set_allowed_area_t;
-
-#define MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA_LEN 27
-#define MAVLINK_MSG_ID_53_LEN 27
-
-
-
-#define MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA { \
-	"SAFETY_SET_ALLOWED_AREA", \
-	9, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_safety_set_allowed_area_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_safety_set_allowed_area_t, target_component) }, \
-         { "frame", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_safety_set_allowed_area_t, frame) }, \
-         { "p1x", NULL, MAVLINK_TYPE_FLOAT, 0, 3, offsetof(mavlink_safety_set_allowed_area_t, p1x) }, \
-         { "p1y", NULL, MAVLINK_TYPE_FLOAT, 0, 7, offsetof(mavlink_safety_set_allowed_area_t, p1y) }, \
-         { "p1z", NULL, MAVLINK_TYPE_FLOAT, 0, 11, offsetof(mavlink_safety_set_allowed_area_t, p1z) }, \
-         { "p2x", NULL, MAVLINK_TYPE_FLOAT, 0, 15, offsetof(mavlink_safety_set_allowed_area_t, p2x) }, \
-         { "p2y", NULL, MAVLINK_TYPE_FLOAT, 0, 19, offsetof(mavlink_safety_set_allowed_area_t, p2y) }, \
-         { "p2z", NULL, MAVLINK_TYPE_FLOAT, 0, 23, offsetof(mavlink_safety_set_allowed_area_t, p2z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a safety_set_allowed_area message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_safety_set_allowed_area_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t frame, float p1x, float p1y, float p1z, float p2x, float p2y, float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[27];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, frame);
-	_mav_put_float(buf, 3, p1x);
-	_mav_put_float(buf, 7, p1y);
-	_mav_put_float(buf, 11, p1z);
-	_mav_put_float(buf, 15, p2x);
-	_mav_put_float(buf, 19, p2y);
-	_mav_put_float(buf, 23, p2z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 27);
-#else
-	mavlink_safety_set_allowed_area_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 27);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA;
-	return mavlink_finalize_message(msg, system_id, component_id, 27);
-}
-
-/**
- * @brief Pack a safety_set_allowed_area message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_safety_set_allowed_area_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t frame,float p1x,float p1y,float p1z,float p2x,float p2y,float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[27];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, frame);
-	_mav_put_float(buf, 3, p1x);
-	_mav_put_float(buf, 7, p1y);
-	_mav_put_float(buf, 11, p1z);
-	_mav_put_float(buf, 15, p2x);
-	_mav_put_float(buf, 19, p2y);
-	_mav_put_float(buf, 23, p2z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 27);
-#else
-	mavlink_safety_set_allowed_area_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 27);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 27);
-}
-
-/**
- * @brief Encode a safety_set_allowed_area struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param safety_set_allowed_area C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_safety_set_allowed_area_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_safety_set_allowed_area_t* safety_set_allowed_area)
-{
-	return mavlink_msg_safety_set_allowed_area_pack(system_id, component_id, msg, safety_set_allowed_area->target_system, safety_set_allowed_area->target_component, safety_set_allowed_area->frame, safety_set_allowed_area->p1x, safety_set_allowed_area->p1y, safety_set_allowed_area->p1z, safety_set_allowed_area->p2x, safety_set_allowed_area->p2y, safety_set_allowed_area->p2z);
-}
-
-/**
- * @brief Send a safety_set_allowed_area message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param frame Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- * @param p1x x position 1 / Latitude 1
- * @param p1y y position 1 / Longitude 1
- * @param p1z z position 1 / Altitude 1
- * @param p2x x position 2 / Latitude 2
- * @param p2y y position 2 / Longitude 2
- * @param p2z z position 2 / Altitude 2
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_safety_set_allowed_area_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t frame, float p1x, float p1y, float p1z, float p2x, float p2y, float p2z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[27];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, frame);
-	_mav_put_float(buf, 3, p1x);
-	_mav_put_float(buf, 7, p1y);
-	_mav_put_float(buf, 11, p1z);
-	_mav_put_float(buf, 15, p2x);
-	_mav_put_float(buf, 19, p2y);
-	_mav_put_float(buf, 23, p2z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA, buf, 27);
-#else
-	mavlink_safety_set_allowed_area_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.frame = frame;
-	packet.p1x = p1x;
-	packet.p1y = p1y;
-	packet.p1z = p1z;
-	packet.p2x = p2x;
-	packet.p2y = p2y;
-	packet.p2z = p2z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA, (const char *)&packet, 27);
-#endif
-}
-
-#endif
-
-// MESSAGE SAFETY_SET_ALLOWED_AREA UNPACKING
-
-
-/**
- * @brief Get field target_system from safety_set_allowed_area message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_safety_set_allowed_area_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from safety_set_allowed_area message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_safety_set_allowed_area_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field frame from safety_set_allowed_area message
- *
- * @return Coordinate frame, as defined by MAV_FRAME enum in mavlink_types.h. Can be either global, GPS, right-handed with Z axis up or local, right handed, Z axis down.
- */
-static inline uint8_t mavlink_msg_safety_set_allowed_area_get_frame(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field p1x from safety_set_allowed_area message
- *
- * @return x position 1 / Latitude 1
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p1x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  3);
-}
-
-/**
- * @brief Get field p1y from safety_set_allowed_area message
- *
- * @return y position 1 / Longitude 1
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p1y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  7);
-}
-
-/**
- * @brief Get field p1z from safety_set_allowed_area message
- *
- * @return z position 1 / Altitude 1
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p1z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  11);
-}
-
-/**
- * @brief Get field p2x from safety_set_allowed_area message
- *
- * @return x position 2 / Latitude 2
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p2x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  15);
-}
-
-/**
- * @brief Get field p2y from safety_set_allowed_area message
- *
- * @return y position 2 / Longitude 2
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p2y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  19);
-}
-
-/**
- * @brief Get field p2z from safety_set_allowed_area message
- *
- * @return z position 2 / Altitude 2
- */
-static inline float mavlink_msg_safety_set_allowed_area_get_p2z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  23);
-}
-
-/**
- * @brief Decode a safety_set_allowed_area message into a struct
- *
- * @param msg The message to decode
- * @param safety_set_allowed_area C-struct to decode the message contents into
- */
-static inline void mavlink_msg_safety_set_allowed_area_decode(const mavlink_message_t* msg, mavlink_safety_set_allowed_area_t* safety_set_allowed_area)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	safety_set_allowed_area->target_system = mavlink_msg_safety_set_allowed_area_get_target_system(msg);
-	safety_set_allowed_area->target_component = mavlink_msg_safety_set_allowed_area_get_target_component(msg);
-	safety_set_allowed_area->frame = mavlink_msg_safety_set_allowed_area_get_frame(msg);
-	safety_set_allowed_area->p1x = mavlink_msg_safety_set_allowed_area_get_p1x(msg);
-	safety_set_allowed_area->p1y = mavlink_msg_safety_set_allowed_area_get_p1y(msg);
-	safety_set_allowed_area->p1z = mavlink_msg_safety_set_allowed_area_get_p1z(msg);
-	safety_set_allowed_area->p2x = mavlink_msg_safety_set_allowed_area_get_p2x(msg);
-	safety_set_allowed_area->p2y = mavlink_msg_safety_set_allowed_area_get_p2y(msg);
-	safety_set_allowed_area->p2z = mavlink_msg_safety_set_allowed_area_get_p2z(msg);
-#else
-	memcpy(safety_set_allowed_area, _MAV_PAYLOAD(msg), 27);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_imu.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_imu.h
deleted file mode 100644
index 4315dac27..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_imu.h
+++ /dev/null
@@ -1,342 +0,0 @@
-// MESSAGE SCALED_IMU PACKING
-
-#define MAVLINK_MSG_ID_SCALED_IMU 26
-
-typedef struct __mavlink_scaled_imu_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- int16_t xacc; ///< X acceleration (mg)
- int16_t yacc; ///< Y acceleration (mg)
- int16_t zacc; ///< Z acceleration (mg)
- int16_t xgyro; ///< Angular speed around X axis (millirad /sec)
- int16_t ygyro; ///< Angular speed around Y axis (millirad /sec)
- int16_t zgyro; ///< Angular speed around Z axis (millirad /sec)
- int16_t xmag; ///< X Magnetic field (milli tesla)
- int16_t ymag; ///< Y Magnetic field (milli tesla)
- int16_t zmag; ///< Z Magnetic field (milli tesla)
-} mavlink_scaled_imu_t;
-
-#define MAVLINK_MSG_ID_SCALED_IMU_LEN 26
-#define MAVLINK_MSG_ID_26_LEN 26
-
-
-
-#define MAVLINK_MESSAGE_INFO_SCALED_IMU { \
-	"SCALED_IMU", \
-	10, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_scaled_imu_t, usec) }, \
-         { "xacc", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_scaled_imu_t, xacc) }, \
-         { "yacc", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_scaled_imu_t, yacc) }, \
-         { "zacc", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_scaled_imu_t, zacc) }, \
-         { "xgyro", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_scaled_imu_t, xgyro) }, \
-         { "ygyro", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_scaled_imu_t, ygyro) }, \
-         { "zgyro", NULL, MAVLINK_TYPE_INT16_T, 0, 18, offsetof(mavlink_scaled_imu_t, zgyro) }, \
-         { "xmag", NULL, MAVLINK_TYPE_INT16_T, 0, 20, offsetof(mavlink_scaled_imu_t, xmag) }, \
-         { "ymag", NULL, MAVLINK_TYPE_INT16_T, 0, 22, offsetof(mavlink_scaled_imu_t, ymag) }, \
-         { "zmag", NULL, MAVLINK_TYPE_INT16_T, 0, 24, offsetof(mavlink_scaled_imu_t, zmag) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a scaled_imu message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- * @param xgyro Angular speed around X axis (millirad /sec)
- * @param ygyro Angular speed around Y axis (millirad /sec)
- * @param zgyro Angular speed around Z axis (millirad /sec)
- * @param xmag X Magnetic field (milli tesla)
- * @param ymag Y Magnetic field (milli tesla)
- * @param zmag Z Magnetic field (milli tesla)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_scaled_imu_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, int16_t xacc, int16_t yacc, int16_t zacc, int16_t xgyro, int16_t ygyro, int16_t zgyro, int16_t xmag, int16_t ymag, int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_scaled_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SCALED_IMU;
-	return mavlink_finalize_message(msg, system_id, component_id, 26);
-}
-
-/**
- * @brief Pack a scaled_imu message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- * @param xgyro Angular speed around X axis (millirad /sec)
- * @param ygyro Angular speed around Y axis (millirad /sec)
- * @param zgyro Angular speed around Z axis (millirad /sec)
- * @param xmag X Magnetic field (milli tesla)
- * @param ymag Y Magnetic field (milli tesla)
- * @param zmag Z Magnetic field (milli tesla)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_scaled_imu_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,int16_t xacc,int16_t yacc,int16_t zacc,int16_t xgyro,int16_t ygyro,int16_t zgyro,int16_t xmag,int16_t ymag,int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_scaled_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SCALED_IMU;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
-}
-
-/**
- * @brief Encode a scaled_imu struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param scaled_imu C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_scaled_imu_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_scaled_imu_t* scaled_imu)
-{
-	return mavlink_msg_scaled_imu_pack(system_id, component_id, msg, scaled_imu->usec, scaled_imu->xacc, scaled_imu->yacc, scaled_imu->zacc, scaled_imu->xgyro, scaled_imu->ygyro, scaled_imu->zgyro, scaled_imu->xmag, scaled_imu->ymag, scaled_imu->zmag);
-}
-
-/**
- * @brief Send a scaled_imu message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param xacc X acceleration (mg)
- * @param yacc Y acceleration (mg)
- * @param zacc Z acceleration (mg)
- * @param xgyro Angular speed around X axis (millirad /sec)
- * @param ygyro Angular speed around Y axis (millirad /sec)
- * @param zgyro Angular speed around Z axis (millirad /sec)
- * @param xmag X Magnetic field (milli tesla)
- * @param ymag Y Magnetic field (milli tesla)
- * @param zmag Z Magnetic field (milli tesla)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_scaled_imu_send(mavlink_channel_t chan, uint64_t usec, int16_t xacc, int16_t yacc, int16_t zacc, int16_t xgyro, int16_t ygyro, int16_t zgyro, int16_t xmag, int16_t ymag, int16_t zmag)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_int16_t(buf, 8, xacc);
-	_mav_put_int16_t(buf, 10, yacc);
-	_mav_put_int16_t(buf, 12, zacc);
-	_mav_put_int16_t(buf, 14, xgyro);
-	_mav_put_int16_t(buf, 16, ygyro);
-	_mav_put_int16_t(buf, 18, zgyro);
-	_mav_put_int16_t(buf, 20, xmag);
-	_mav_put_int16_t(buf, 22, ymag);
-	_mav_put_int16_t(buf, 24, zmag);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SCALED_IMU, buf, 26);
-#else
-	mavlink_scaled_imu_t packet;
-	packet.usec = usec;
-	packet.xacc = xacc;
-	packet.yacc = yacc;
-	packet.zacc = zacc;
-	packet.xgyro = xgyro;
-	packet.ygyro = ygyro;
-	packet.zgyro = zgyro;
-	packet.xmag = xmag;
-	packet.ymag = ymag;
-	packet.zmag = zmag;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SCALED_IMU, (const char *)&packet, 26);
-#endif
-}
-
-#endif
-
-// MESSAGE SCALED_IMU UNPACKING
-
-
-/**
- * @brief Get field usec from scaled_imu message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_scaled_imu_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field xacc from scaled_imu message
- *
- * @return X acceleration (mg)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_xacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field yacc from scaled_imu message
- *
- * @return Y acceleration (mg)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_yacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field zacc from scaled_imu message
- *
- * @return Z acceleration (mg)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_zacc(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field xgyro from scaled_imu message
- *
- * @return Angular speed around X axis (millirad /sec)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_xgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field ygyro from scaled_imu message
- *
- * @return Angular speed around Y axis (millirad /sec)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_ygyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Get field zgyro from scaled_imu message
- *
- * @return Angular speed around Z axis (millirad /sec)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_zgyro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  18);
-}
-
-/**
- * @brief Get field xmag from scaled_imu message
- *
- * @return X Magnetic field (milli tesla)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_xmag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  20);
-}
-
-/**
- * @brief Get field ymag from scaled_imu message
- *
- * @return Y Magnetic field (milli tesla)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_ymag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  22);
-}
-
-/**
- * @brief Get field zmag from scaled_imu message
- *
- * @return Z Magnetic field (milli tesla)
- */
-static inline int16_t mavlink_msg_scaled_imu_get_zmag(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  24);
-}
-
-/**
- * @brief Decode a scaled_imu message into a struct
- *
- * @param msg The message to decode
- * @param scaled_imu C-struct to decode the message contents into
- */
-static inline void mavlink_msg_scaled_imu_decode(const mavlink_message_t* msg, mavlink_scaled_imu_t* scaled_imu)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	scaled_imu->usec = mavlink_msg_scaled_imu_get_usec(msg);
-	scaled_imu->xacc = mavlink_msg_scaled_imu_get_xacc(msg);
-	scaled_imu->yacc = mavlink_msg_scaled_imu_get_yacc(msg);
-	scaled_imu->zacc = mavlink_msg_scaled_imu_get_zacc(msg);
-	scaled_imu->xgyro = mavlink_msg_scaled_imu_get_xgyro(msg);
-	scaled_imu->ygyro = mavlink_msg_scaled_imu_get_ygyro(msg);
-	scaled_imu->zgyro = mavlink_msg_scaled_imu_get_zgyro(msg);
-	scaled_imu->xmag = mavlink_msg_scaled_imu_get_xmag(msg);
-	scaled_imu->ymag = mavlink_msg_scaled_imu_get_ymag(msg);
-	scaled_imu->zmag = mavlink_msg_scaled_imu_get_zmag(msg);
-#else
-	memcpy(scaled_imu, _MAV_PAYLOAD(msg), 26);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_pressure.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_pressure.h
deleted file mode 100644
index 579f7f4ee..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_scaled_pressure.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE SCALED_PRESSURE PACKING
-
-#define MAVLINK_MSG_ID_SCALED_PRESSURE 38
-
-typedef struct __mavlink_scaled_pressure_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float press_abs; ///< Absolute pressure (hectopascal)
- float press_diff; ///< Differential pressure 1 (hectopascal)
- int16_t temperature; ///< Temperature measurement (0.01 degrees celsius)
-} mavlink_scaled_pressure_t;
-
-#define MAVLINK_MSG_ID_SCALED_PRESSURE_LEN 18
-#define MAVLINK_MSG_ID_38_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_SCALED_PRESSURE { \
-	"SCALED_PRESSURE", \
-	4, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_scaled_pressure_t, usec) }, \
-         { "press_abs", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_scaled_pressure_t, press_abs) }, \
-         { "press_diff", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_scaled_pressure_t, press_diff) }, \
-         { "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_scaled_pressure_t, temperature) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a scaled_pressure message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (hectopascal)
- * @param press_diff Differential pressure 1 (hectopascal)
- * @param temperature Temperature measurement (0.01 degrees celsius)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_scaled_pressure_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float press_abs, float press_diff, int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, press_abs);
-	_mav_put_float(buf, 12, press_diff);
-	_mav_put_int16_t(buf, 16, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_scaled_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff = press_diff;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SCALED_PRESSURE;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a scaled_pressure message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (hectopascal)
- * @param press_diff Differential pressure 1 (hectopascal)
- * @param temperature Temperature measurement (0.01 degrees celsius)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_scaled_pressure_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float press_abs,float press_diff,int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, press_abs);
-	_mav_put_float(buf, 12, press_diff);
-	_mav_put_int16_t(buf, 16, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_scaled_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff = press_diff;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SCALED_PRESSURE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a scaled_pressure struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param scaled_pressure C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_scaled_pressure_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_scaled_pressure_t* scaled_pressure)
-{
-	return mavlink_msg_scaled_pressure_pack(system_id, component_id, msg, scaled_pressure->usec, scaled_pressure->press_abs, scaled_pressure->press_diff, scaled_pressure->temperature);
-}
-
-/**
- * @brief Send a scaled_pressure message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param press_abs Absolute pressure (hectopascal)
- * @param press_diff Differential pressure 1 (hectopascal)
- * @param temperature Temperature measurement (0.01 degrees celsius)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_scaled_pressure_send(mavlink_channel_t chan, uint64_t usec, float press_abs, float press_diff, int16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, press_abs);
-	_mav_put_float(buf, 12, press_diff);
-	_mav_put_int16_t(buf, 16, temperature);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SCALED_PRESSURE, buf, 18);
-#else
-	mavlink_scaled_pressure_t packet;
-	packet.usec = usec;
-	packet.press_abs = press_abs;
-	packet.press_diff = press_diff;
-	packet.temperature = temperature;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SCALED_PRESSURE, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE SCALED_PRESSURE UNPACKING
-
-
-/**
- * @brief Get field usec from scaled_pressure message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_scaled_pressure_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field press_abs from scaled_pressure message
- *
- * @return Absolute pressure (hectopascal)
- */
-static inline float mavlink_msg_scaled_pressure_get_press_abs(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field press_diff from scaled_pressure message
- *
- * @return Differential pressure 1 (hectopascal)
- */
-static inline float mavlink_msg_scaled_pressure_get_press_diff(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field temperature from scaled_pressure message
- *
- * @return Temperature measurement (0.01 degrees celsius)
- */
-static inline int16_t mavlink_msg_scaled_pressure_get_temperature(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Decode a scaled_pressure message into a struct
- *
- * @param msg The message to decode
- * @param scaled_pressure C-struct to decode the message contents into
- */
-static inline void mavlink_msg_scaled_pressure_decode(const mavlink_message_t* msg, mavlink_scaled_pressure_t* scaled_pressure)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	scaled_pressure->usec = mavlink_msg_scaled_pressure_get_usec(msg);
-	scaled_pressure->press_abs = mavlink_msg_scaled_pressure_get_press_abs(msg);
-	scaled_pressure->press_diff = mavlink_msg_scaled_pressure_get_press_diff(msg);
-	scaled_pressure->temperature = mavlink_msg_scaled_pressure_get_temperature(msg);
-#else
-	memcpy(scaled_pressure, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_servo_output_raw.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_servo_output_raw.h
deleted file mode 100644
index b5be3318c..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_servo_output_raw.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// MESSAGE SERVO_OUTPUT_RAW PACKING
-
-#define MAVLINK_MSG_ID_SERVO_OUTPUT_RAW 37
-
-typedef struct __mavlink_servo_output_raw_t
-{
- uint16_t servo1_raw; ///< Servo output 1 value, in microseconds
- uint16_t servo2_raw; ///< Servo output 2 value, in microseconds
- uint16_t servo3_raw; ///< Servo output 3 value, in microseconds
- uint16_t servo4_raw; ///< Servo output 4 value, in microseconds
- uint16_t servo5_raw; ///< Servo output 5 value, in microseconds
- uint16_t servo6_raw; ///< Servo output 6 value, in microseconds
- uint16_t servo7_raw; ///< Servo output 7 value, in microseconds
- uint16_t servo8_raw; ///< Servo output 8 value, in microseconds
-} mavlink_servo_output_raw_t;
-
-#define MAVLINK_MSG_ID_SERVO_OUTPUT_RAW_LEN 16
-#define MAVLINK_MSG_ID_37_LEN 16
-
-
-
-#define MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW { \
-	"SERVO_OUTPUT_RAW", \
-	8, \
-	{  { "servo1_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_servo_output_raw_t, servo1_raw) }, \
-         { "servo2_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_servo_output_raw_t, servo2_raw) }, \
-         { "servo3_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_servo_output_raw_t, servo3_raw) }, \
-         { "servo4_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_servo_output_raw_t, servo4_raw) }, \
-         { "servo5_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_servo_output_raw_t, servo5_raw) }, \
-         { "servo6_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_servo_output_raw_t, servo6_raw) }, \
-         { "servo7_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_servo_output_raw_t, servo7_raw) }, \
-         { "servo8_raw", NULL, MAVLINK_TYPE_UINT16_T, 0, 14, offsetof(mavlink_servo_output_raw_t, servo8_raw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a servo_output_raw message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param servo1_raw Servo output 1 value, in microseconds
- * @param servo2_raw Servo output 2 value, in microseconds
- * @param servo3_raw Servo output 3 value, in microseconds
- * @param servo4_raw Servo output 4 value, in microseconds
- * @param servo5_raw Servo output 5 value, in microseconds
- * @param servo6_raw Servo output 6 value, in microseconds
- * @param servo7_raw Servo output 7 value, in microseconds
- * @param servo8_raw Servo output 8 value, in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_servo_output_raw_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t servo1_raw, uint16_t servo2_raw, uint16_t servo3_raw, uint16_t servo4_raw, uint16_t servo5_raw, uint16_t servo6_raw, uint16_t servo7_raw, uint16_t servo8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, servo1_raw);
-	_mav_put_uint16_t(buf, 2, servo2_raw);
-	_mav_put_uint16_t(buf, 4, servo3_raw);
-	_mav_put_uint16_t(buf, 6, servo4_raw);
-	_mav_put_uint16_t(buf, 8, servo5_raw);
-	_mav_put_uint16_t(buf, 10, servo6_raw);
-	_mav_put_uint16_t(buf, 12, servo7_raw);
-	_mav_put_uint16_t(buf, 14, servo8_raw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_servo_output_raw_t packet;
-	packet.servo1_raw = servo1_raw;
-	packet.servo2_raw = servo2_raw;
-	packet.servo3_raw = servo3_raw;
-	packet.servo4_raw = servo4_raw;
-	packet.servo5_raw = servo5_raw;
-	packet.servo6_raw = servo6_raw;
-	packet.servo7_raw = servo7_raw;
-	packet.servo8_raw = servo8_raw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SERVO_OUTPUT_RAW;
-	return mavlink_finalize_message(msg, system_id, component_id, 16);
-}
-
-/**
- * @brief Pack a servo_output_raw message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param servo1_raw Servo output 1 value, in microseconds
- * @param servo2_raw Servo output 2 value, in microseconds
- * @param servo3_raw Servo output 3 value, in microseconds
- * @param servo4_raw Servo output 4 value, in microseconds
- * @param servo5_raw Servo output 5 value, in microseconds
- * @param servo6_raw Servo output 6 value, in microseconds
- * @param servo7_raw Servo output 7 value, in microseconds
- * @param servo8_raw Servo output 8 value, in microseconds
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_servo_output_raw_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t servo1_raw,uint16_t servo2_raw,uint16_t servo3_raw,uint16_t servo4_raw,uint16_t servo5_raw,uint16_t servo6_raw,uint16_t servo7_raw,uint16_t servo8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, servo1_raw);
-	_mav_put_uint16_t(buf, 2, servo2_raw);
-	_mav_put_uint16_t(buf, 4, servo3_raw);
-	_mav_put_uint16_t(buf, 6, servo4_raw);
-	_mav_put_uint16_t(buf, 8, servo5_raw);
-	_mav_put_uint16_t(buf, 10, servo6_raw);
-	_mav_put_uint16_t(buf, 12, servo7_raw);
-	_mav_put_uint16_t(buf, 14, servo8_raw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_servo_output_raw_t packet;
-	packet.servo1_raw = servo1_raw;
-	packet.servo2_raw = servo2_raw;
-	packet.servo3_raw = servo3_raw;
-	packet.servo4_raw = servo4_raw;
-	packet.servo5_raw = servo5_raw;
-	packet.servo6_raw = servo6_raw;
-	packet.servo7_raw = servo7_raw;
-	packet.servo8_raw = servo8_raw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SERVO_OUTPUT_RAW;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
-}
-
-/**
- * @brief Encode a servo_output_raw struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param servo_output_raw C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_servo_output_raw_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_servo_output_raw_t* servo_output_raw)
-{
-	return mavlink_msg_servo_output_raw_pack(system_id, component_id, msg, servo_output_raw->servo1_raw, servo_output_raw->servo2_raw, servo_output_raw->servo3_raw, servo_output_raw->servo4_raw, servo_output_raw->servo5_raw, servo_output_raw->servo6_raw, servo_output_raw->servo7_raw, servo_output_raw->servo8_raw);
-}
-
-/**
- * @brief Send a servo_output_raw message
- * @param chan MAVLink channel to send the message
- *
- * @param servo1_raw Servo output 1 value, in microseconds
- * @param servo2_raw Servo output 2 value, in microseconds
- * @param servo3_raw Servo output 3 value, in microseconds
- * @param servo4_raw Servo output 4 value, in microseconds
- * @param servo5_raw Servo output 5 value, in microseconds
- * @param servo6_raw Servo output 6 value, in microseconds
- * @param servo7_raw Servo output 7 value, in microseconds
- * @param servo8_raw Servo output 8 value, in microseconds
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_servo_output_raw_send(mavlink_channel_t chan, uint16_t servo1_raw, uint16_t servo2_raw, uint16_t servo3_raw, uint16_t servo4_raw, uint16_t servo5_raw, uint16_t servo6_raw, uint16_t servo7_raw, uint16_t servo8_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, servo1_raw);
-	_mav_put_uint16_t(buf, 2, servo2_raw);
-	_mav_put_uint16_t(buf, 4, servo3_raw);
-	_mav_put_uint16_t(buf, 6, servo4_raw);
-	_mav_put_uint16_t(buf, 8, servo5_raw);
-	_mav_put_uint16_t(buf, 10, servo6_raw);
-	_mav_put_uint16_t(buf, 12, servo7_raw);
-	_mav_put_uint16_t(buf, 14, servo8_raw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SERVO_OUTPUT_RAW, buf, 16);
-#else
-	mavlink_servo_output_raw_t packet;
-	packet.servo1_raw = servo1_raw;
-	packet.servo2_raw = servo2_raw;
-	packet.servo3_raw = servo3_raw;
-	packet.servo4_raw = servo4_raw;
-	packet.servo5_raw = servo5_raw;
-	packet.servo6_raw = servo6_raw;
-	packet.servo7_raw = servo7_raw;
-	packet.servo8_raw = servo8_raw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SERVO_OUTPUT_RAW, (const char *)&packet, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE SERVO_OUTPUT_RAW UNPACKING
-
-
-/**
- * @brief Get field servo1_raw from servo_output_raw message
- *
- * @return Servo output 1 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo1_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field servo2_raw from servo_output_raw message
- *
- * @return Servo output 2 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo2_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field servo3_raw from servo_output_raw message
- *
- * @return Servo output 3 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo3_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field servo4_raw from servo_output_raw message
- *
- * @return Servo output 4 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo4_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  6);
-}
-
-/**
- * @brief Get field servo5_raw from servo_output_raw message
- *
- * @return Servo output 5 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo5_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Get field servo6_raw from servo_output_raw message
- *
- * @return Servo output 6 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo6_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Get field servo7_raw from servo_output_raw message
- *
- * @return Servo output 7 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo7_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  12);
-}
-
-/**
- * @brief Get field servo8_raw from servo_output_raw message
- *
- * @return Servo output 8 value, in microseconds
- */
-static inline uint16_t mavlink_msg_servo_output_raw_get_servo8_raw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  14);
-}
-
-/**
- * @brief Decode a servo_output_raw message into a struct
- *
- * @param msg The message to decode
- * @param servo_output_raw C-struct to decode the message contents into
- */
-static inline void mavlink_msg_servo_output_raw_decode(const mavlink_message_t* msg, mavlink_servo_output_raw_t* servo_output_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	servo_output_raw->servo1_raw = mavlink_msg_servo_output_raw_get_servo1_raw(msg);
-	servo_output_raw->servo2_raw = mavlink_msg_servo_output_raw_get_servo2_raw(msg);
-	servo_output_raw->servo3_raw = mavlink_msg_servo_output_raw_get_servo3_raw(msg);
-	servo_output_raw->servo4_raw = mavlink_msg_servo_output_raw_get_servo4_raw(msg);
-	servo_output_raw->servo5_raw = mavlink_msg_servo_output_raw_get_servo5_raw(msg);
-	servo_output_raw->servo6_raw = mavlink_msg_servo_output_raw_get_servo6_raw(msg);
-	servo_output_raw->servo7_raw = mavlink_msg_servo_output_raw_get_servo7_raw(msg);
-	servo_output_raw->servo8_raw = mavlink_msg_servo_output_raw_get_servo8_raw(msg);
-#else
-	memcpy(servo_output_raw, _MAV_PAYLOAD(msg), 16);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_altitude.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_altitude.h
deleted file mode 100644
index 72cc5e7b0..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_altitude.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE SET_ALTITUDE PACKING
-
-#define MAVLINK_MSG_ID_SET_ALTITUDE 65
-
-typedef struct __mavlink_set_altitude_t
-{
- uint8_t target; ///< The system setting the altitude
- uint32_t mode; ///< The new altitude in meters
-} mavlink_set_altitude_t;
-
-#define MAVLINK_MSG_ID_SET_ALTITUDE_LEN 5
-#define MAVLINK_MSG_ID_65_LEN 5
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_ALTITUDE { \
-	"SET_ALTITUDE", \
-	2, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_altitude_t, target) }, \
-         { "mode", NULL, MAVLINK_TYPE_UINT32_T, 0, 1, offsetof(mavlink_set_altitude_t, mode) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_altitude message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the altitude
- * @param mode The new altitude in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_altitude_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint32_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint32_t(buf, 1, mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 5);
-#else
-	mavlink_set_altitude_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 5);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ALTITUDE;
-	return mavlink_finalize_message(msg, system_id, component_id, 5);
-}
-
-/**
- * @brief Pack a set_altitude message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the altitude
- * @param mode The new altitude in meters
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_altitude_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint32_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint32_t(buf, 1, mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 5);
-#else
-	mavlink_set_altitude_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 5);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ALTITUDE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 5);
-}
-
-/**
- * @brief Encode a set_altitude struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_altitude C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_altitude_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_altitude_t* set_altitude)
-{
-	return mavlink_msg_set_altitude_pack(system_id, component_id, msg, set_altitude->target, set_altitude->mode);
-}
-
-/**
- * @brief Send a set_altitude message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the altitude
- * @param mode The new altitude in meters
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_altitude_send(mavlink_channel_t chan, uint8_t target, uint32_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[5];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint32_t(buf, 1, mode);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ALTITUDE, buf, 5);
-#else
-	mavlink_set_altitude_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ALTITUDE, (const char *)&packet, 5);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_ALTITUDE UNPACKING
-
-
-/**
- * @brief Get field target from set_altitude message
- *
- * @return The system setting the altitude
- */
-static inline uint8_t mavlink_msg_set_altitude_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field mode from set_altitude message
- *
- * @return The new altitude in meters
- */
-static inline uint32_t mavlink_msg_set_altitude_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  1);
-}
-
-/**
- * @brief Decode a set_altitude message into a struct
- *
- * @param msg The message to decode
- * @param set_altitude C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_altitude_decode(const mavlink_message_t* msg, mavlink_set_altitude_t* set_altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_altitude->target = mavlink_msg_set_altitude_get_target(msg);
-	set_altitude->mode = mavlink_msg_set_altitude_get_mode(msg);
-#else
-	memcpy(set_altitude, _MAV_PAYLOAD(msg), 5);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_mode.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_mode.h
deleted file mode 100644
index 8a3f20593..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_mode.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE SET_MODE PACKING
-
-#define MAVLINK_MSG_ID_SET_MODE 11
-
-typedef struct __mavlink_set_mode_t
-{
- uint8_t target; ///< The system setting the mode
- uint8_t mode; ///< The new mode
-} mavlink_set_mode_t;
-
-#define MAVLINK_MSG_ID_SET_MODE_LEN 2
-#define MAVLINK_MSG_ID_11_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_MODE { \
-	"SET_MODE", \
-	2, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_mode_t, target) }, \
-         { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_mode_t, mode) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_mode message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the mode
- * @param mode The new mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_mode_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_set_mode_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_MODE;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a set_mode message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the mode
- * @param mode The new mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_mode_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_set_mode_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_MODE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a set_mode struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_mode C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_mode_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_mode_t* set_mode)
-{
-	return mavlink_msg_set_mode_pack(system_id, component_id, msg, set_mode->target, set_mode->mode);
-}
-
-/**
- * @brief Send a set_mode message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the mode
- * @param mode The new mode
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_mode_send(mavlink_channel_t chan, uint8_t target, uint8_t mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, mode);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_MODE, buf, 2);
-#else
-	mavlink_set_mode_t packet;
-	packet.target = target;
-	packet.mode = mode;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_MODE, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_MODE UNPACKING
-
-
-/**
- * @brief Get field target from set_mode message
- *
- * @return The system setting the mode
- */
-static inline uint8_t mavlink_msg_set_mode_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field mode from set_mode message
- *
- * @return The new mode
- */
-static inline uint8_t mavlink_msg_set_mode_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a set_mode message into a struct
- *
- * @param msg The message to decode
- * @param set_mode C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_mode_decode(const mavlink_message_t* msg, mavlink_set_mode_t* set_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_mode->target = mavlink_msg_set_mode_get_target(msg);
-	set_mode->mode = mavlink_msg_set_mode_get_mode(msg);
-#else
-	memcpy(set_mode, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_nav_mode.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_nav_mode.h
deleted file mode 100644
index 02efa26b1..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_nav_mode.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE SET_NAV_MODE PACKING
-
-#define MAVLINK_MSG_ID_SET_NAV_MODE 12
-
-typedef struct __mavlink_set_nav_mode_t
-{
- uint8_t target; ///< The system setting the mode
- uint8_t nav_mode; ///< The new navigation mode
-} mavlink_set_nav_mode_t;
-
-#define MAVLINK_MSG_ID_SET_NAV_MODE_LEN 2
-#define MAVLINK_MSG_ID_12_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_NAV_MODE { \
-	"SET_NAV_MODE", \
-	2, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_nav_mode_t, target) }, \
-         { "nav_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_nav_mode_t, nav_mode) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_nav_mode message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the mode
- * @param nav_mode The new navigation mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_nav_mode_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_set_nav_mode_t packet;
-	packet.target = target;
-	packet.nav_mode = nav_mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_NAV_MODE;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a set_nav_mode message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the mode
- * @param nav_mode The new navigation mode
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_nav_mode_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_set_nav_mode_t packet;
-	packet.target = target;
-	packet.nav_mode = nav_mode;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_NAV_MODE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a set_nav_mode struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_nav_mode C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_nav_mode_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_nav_mode_t* set_nav_mode)
-{
-	return mavlink_msg_set_nav_mode_pack(system_id, component_id, msg, set_nav_mode->target, set_nav_mode->nav_mode);
-}
-
-/**
- * @brief Send a set_nav_mode message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the mode
- * @param nav_mode The new navigation mode
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_nav_mode_send(mavlink_channel_t chan, uint8_t target, uint8_t nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_NAV_MODE, buf, 2);
-#else
-	mavlink_set_nav_mode_t packet;
-	packet.target = target;
-	packet.nav_mode = nav_mode;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_NAV_MODE, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_NAV_MODE UNPACKING
-
-
-/**
- * @brief Get field target from set_nav_mode message
- *
- * @return The system setting the mode
- */
-static inline uint8_t mavlink_msg_set_nav_mode_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field nav_mode from set_nav_mode message
- *
- * @return The new navigation mode
- */
-static inline uint8_t mavlink_msg_set_nav_mode_get_nav_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a set_nav_mode message into a struct
- *
- * @param msg The message to decode
- * @param set_nav_mode C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_nav_mode_decode(const mavlink_message_t* msg, mavlink_set_nav_mode_t* set_nav_mode)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_nav_mode->target = mavlink_msg_set_nav_mode_get_target(msg);
-	set_nav_mode->nav_mode = mavlink_msg_set_nav_mode_get_nav_mode(msg);
-#else
-	memcpy(set_nav_mode, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_speed_thrust.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_speed_thrust.h
deleted file mode 100644
index 6a9c01215..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_speed_thrust.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE SET_ROLL_PITCH_YAW_SPEED_THRUST PACKING
-
-#define MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST 56
-
-typedef struct __mavlink_set_roll_pitch_yaw_speed_thrust_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- float roll_speed; ///< Desired roll angular speed in rad/s
- float pitch_speed; ///< Desired pitch angular speed in rad/s
- float yaw_speed; ///< Desired yaw angular speed in rad/s
- float thrust; ///< Collective thrust, normalized to 0 .. 1
-} mavlink_set_roll_pitch_yaw_speed_thrust_t;
-
-#define MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST_LEN 18
-#define MAVLINK_MSG_ID_56_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST { \
-	"SET_ROLL_PITCH_YAW_SPEED_THRUST", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, target_component) }, \
-         { "roll_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, roll_speed) }, \
-         { "pitch_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, pitch_speed) }, \
-         { "yaw_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, yaw_speed) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_set_roll_pitch_yaw_speed_thrust_t, thrust) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_roll_pitch_yaw_speed_thrust message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_speed_thrust_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, float roll_speed, float pitch_speed, float yaw_speed, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll_speed);
-	_mav_put_float(buf, 6, pitch_speed);
-	_mav_put_float(buf, 10, yaw_speed);
-	_mav_put_float(buf, 14, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_speed_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a set_roll_pitch_yaw_speed_thrust message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_speed_thrust_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,float roll_speed,float pitch_speed,float yaw_speed,float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll_speed);
-	_mav_put_float(buf, 6, pitch_speed);
-	_mav_put_float(buf, 10, yaw_speed);
-	_mav_put_float(buf, 14, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_speed_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a set_roll_pitch_yaw_speed_thrust struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_roll_pitch_yaw_speed_thrust C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_speed_thrust_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_roll_pitch_yaw_speed_thrust_t* set_roll_pitch_yaw_speed_thrust)
-{
-	return mavlink_msg_set_roll_pitch_yaw_speed_thrust_pack(system_id, component_id, msg, set_roll_pitch_yaw_speed_thrust->target_system, set_roll_pitch_yaw_speed_thrust->target_component, set_roll_pitch_yaw_speed_thrust->roll_speed, set_roll_pitch_yaw_speed_thrust->pitch_speed, set_roll_pitch_yaw_speed_thrust->yaw_speed, set_roll_pitch_yaw_speed_thrust->thrust);
-}
-
-/**
- * @brief Send a set_roll_pitch_yaw_speed_thrust message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll_speed Desired roll angular speed in rad/s
- * @param pitch_speed Desired pitch angular speed in rad/s
- * @param yaw_speed Desired yaw angular speed in rad/s
- * @param thrust Collective thrust, normalized to 0 .. 1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_roll_pitch_yaw_speed_thrust_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, float roll_speed, float pitch_speed, float yaw_speed, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll_speed);
-	_mav_put_float(buf, 6, pitch_speed);
-	_mav_put_float(buf, 10, yaw_speed);
-	_mav_put_float(buf, 14, thrust);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST, buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_speed_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll_speed = roll_speed;
-	packet.pitch_speed = pitch_speed;
-	packet.yaw_speed = yaw_speed;
-	packet.thrust = thrust;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_SPEED_THRUST, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_ROLL_PITCH_YAW_SPEED_THRUST UNPACKING
-
-
-/**
- * @brief Get field target_system from set_roll_pitch_yaw_speed_thrust message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from set_roll_pitch_yaw_speed_thrust message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field roll_speed from set_roll_pitch_yaw_speed_thrust message
- *
- * @return Desired roll angular speed in rad/s
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_roll_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field pitch_speed from set_roll_pitch_yaw_speed_thrust message
- *
- * @return Desired pitch angular speed in rad/s
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_pitch_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field yaw_speed from set_roll_pitch_yaw_speed_thrust message
- *
- * @return Desired yaw angular speed in rad/s
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_yaw_speed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field thrust from set_roll_pitch_yaw_speed_thrust message
- *
- * @return Collective thrust, normalized to 0 .. 1
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a set_roll_pitch_yaw_speed_thrust message into a struct
- *
- * @param msg The message to decode
- * @param set_roll_pitch_yaw_speed_thrust C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(const mavlink_message_t* msg, mavlink_set_roll_pitch_yaw_speed_thrust_t* set_roll_pitch_yaw_speed_thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_roll_pitch_yaw_speed_thrust->target_system = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_target_system(msg);
-	set_roll_pitch_yaw_speed_thrust->target_component = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_target_component(msg);
-	set_roll_pitch_yaw_speed_thrust->roll_speed = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_roll_speed(msg);
-	set_roll_pitch_yaw_speed_thrust->pitch_speed = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_pitch_speed(msg);
-	set_roll_pitch_yaw_speed_thrust->yaw_speed = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_yaw_speed(msg);
-	set_roll_pitch_yaw_speed_thrust->thrust = mavlink_msg_set_roll_pitch_yaw_speed_thrust_get_thrust(msg);
-#else
-	memcpy(set_roll_pitch_yaw_speed_thrust, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_thrust.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_thrust.h
deleted file mode 100644
index dad4f657d..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_thrust.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE SET_ROLL_PITCH_YAW_THRUST PACKING
-
-#define MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST 55
-
-typedef struct __mavlink_set_roll_pitch_yaw_thrust_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- float roll; ///< Desired roll angle in radians
- float pitch; ///< Desired pitch angle in radians
- float yaw; ///< Desired yaw angle in radians
- float thrust; ///< Collective thrust, normalized to 0 .. 1
-} mavlink_set_roll_pitch_yaw_thrust_t;
-
-#define MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST_LEN 18
-#define MAVLINK_MSG_ID_55_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST { \
-	"SET_ROLL_PITCH_YAW_THRUST", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, target_component) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, yaw) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_set_roll_pitch_yaw_thrust_t, thrust) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_roll_pitch_yaw_thrust message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_thrust_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, float roll, float pitch, float yaw, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll);
-	_mav_put_float(buf, 6, pitch);
-	_mav_put_float(buf, 10, yaw);
-	_mav_put_float(buf, 14, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a set_roll_pitch_yaw_thrust message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_thrust_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,float roll,float pitch,float yaw,float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll);
-	_mav_put_float(buf, 6, pitch);
-	_mav_put_float(buf, 10, yaw);
-	_mav_put_float(buf, 14, thrust);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a set_roll_pitch_yaw_thrust struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_roll_pitch_yaw_thrust C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_roll_pitch_yaw_thrust_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_roll_pitch_yaw_thrust_t* set_roll_pitch_yaw_thrust)
-{
-	return mavlink_msg_set_roll_pitch_yaw_thrust_pack(system_id, component_id, msg, set_roll_pitch_yaw_thrust->target_system, set_roll_pitch_yaw_thrust->target_component, set_roll_pitch_yaw_thrust->roll, set_roll_pitch_yaw_thrust->pitch, set_roll_pitch_yaw_thrust->yaw, set_roll_pitch_yaw_thrust->thrust);
-}
-
-/**
- * @brief Send a set_roll_pitch_yaw_thrust message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param roll Desired roll angle in radians
- * @param pitch Desired pitch angle in radians
- * @param yaw Desired yaw angle in radians
- * @param thrust Collective thrust, normalized to 0 .. 1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_roll_pitch_yaw_thrust_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, float roll, float pitch, float yaw, float thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, roll);
-	_mav_put_float(buf, 6, pitch);
-	_mav_put_float(buf, 10, yaw);
-	_mav_put_float(buf, 14, thrust);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST, buf, 18);
-#else
-	mavlink_set_roll_pitch_yaw_thrust_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROLL_PITCH_YAW_THRUST, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_ROLL_PITCH_YAW_THRUST UNPACKING
-
-
-/**
- * @brief Get field target_system from set_roll_pitch_yaw_thrust message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_set_roll_pitch_yaw_thrust_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from set_roll_pitch_yaw_thrust message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_set_roll_pitch_yaw_thrust_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field roll from set_roll_pitch_yaw_thrust message
- *
- * @return Desired roll angle in radians
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_thrust_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field pitch from set_roll_pitch_yaw_thrust message
- *
- * @return Desired pitch angle in radians
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_thrust_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field yaw from set_roll_pitch_yaw_thrust message
- *
- * @return Desired yaw angle in radians
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_thrust_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field thrust from set_roll_pitch_yaw_thrust message
- *
- * @return Collective thrust, normalized to 0 .. 1
- */
-static inline float mavlink_msg_set_roll_pitch_yaw_thrust_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a set_roll_pitch_yaw_thrust message into a struct
- *
- * @param msg The message to decode
- * @param set_roll_pitch_yaw_thrust C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_roll_pitch_yaw_thrust_decode(const mavlink_message_t* msg, mavlink_set_roll_pitch_yaw_thrust_t* set_roll_pitch_yaw_thrust)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_roll_pitch_yaw_thrust->target_system = mavlink_msg_set_roll_pitch_yaw_thrust_get_target_system(msg);
-	set_roll_pitch_yaw_thrust->target_component = mavlink_msg_set_roll_pitch_yaw_thrust_get_target_component(msg);
-	set_roll_pitch_yaw_thrust->roll = mavlink_msg_set_roll_pitch_yaw_thrust_get_roll(msg);
-	set_roll_pitch_yaw_thrust->pitch = mavlink_msg_set_roll_pitch_yaw_thrust_get_pitch(msg);
-	set_roll_pitch_yaw_thrust->yaw = mavlink_msg_set_roll_pitch_yaw_thrust_get_yaw(msg);
-	set_roll_pitch_yaw_thrust->thrust = mavlink_msg_set_roll_pitch_yaw_thrust_get_thrust(msg);
-#else
-	memcpy(set_roll_pitch_yaw_thrust, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_state_correction.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_state_correction.h
deleted file mode 100644
index ddd785a2a..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_state_correction.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE STATE_CORRECTION PACKING
-
-#define MAVLINK_MSG_ID_STATE_CORRECTION 64
-
-typedef struct __mavlink_state_correction_t
-{
- float xErr; ///< x position error
- float yErr; ///< y position error
- float zErr; ///< z position error
- float rollErr; ///< roll error (radians)
- float pitchErr; ///< pitch error (radians)
- float yawErr; ///< yaw error (radians)
- float vxErr; ///< x velocity
- float vyErr; ///< y velocity
- float vzErr; ///< z velocity
-} mavlink_state_correction_t;
-
-#define MAVLINK_MSG_ID_STATE_CORRECTION_LEN 36
-#define MAVLINK_MSG_ID_64_LEN 36
-
-
-
-#define MAVLINK_MESSAGE_INFO_STATE_CORRECTION { \
-	"STATE_CORRECTION", \
-	9, \
-	{  { "xErr", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_state_correction_t, xErr) }, \
-         { "yErr", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_state_correction_t, yErr) }, \
-         { "zErr", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_state_correction_t, zErr) }, \
-         { "rollErr", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_state_correction_t, rollErr) }, \
-         { "pitchErr", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_state_correction_t, pitchErr) }, \
-         { "yawErr", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_state_correction_t, yawErr) }, \
-         { "vxErr", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_state_correction_t, vxErr) }, \
-         { "vyErr", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_state_correction_t, vyErr) }, \
-         { "vzErr", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_state_correction_t, vzErr) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a state_correction message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param xErr x position error
- * @param yErr y position error
- * @param zErr z position error
- * @param rollErr roll error (radians)
- * @param pitchErr pitch error (radians)
- * @param yawErr yaw error (radians)
- * @param vxErr x velocity
- * @param vyErr y velocity
- * @param vzErr z velocity
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_state_correction_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float xErr, float yErr, float zErr, float rollErr, float pitchErr, float yawErr, float vxErr, float vyErr, float vzErr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, xErr);
-	_mav_put_float(buf, 4, yErr);
-	_mav_put_float(buf, 8, zErr);
-	_mav_put_float(buf, 12, rollErr);
-	_mav_put_float(buf, 16, pitchErr);
-	_mav_put_float(buf, 20, yawErr);
-	_mav_put_float(buf, 24, vxErr);
-	_mav_put_float(buf, 28, vyErr);
-	_mav_put_float(buf, 32, vzErr);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_state_correction_t packet;
-	packet.xErr = xErr;
-	packet.yErr = yErr;
-	packet.zErr = zErr;
-	packet.rollErr = rollErr;
-	packet.pitchErr = pitchErr;
-	packet.yawErr = yawErr;
-	packet.vxErr = vxErr;
-	packet.vyErr = vyErr;
-	packet.vzErr = vzErr;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_STATE_CORRECTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 36);
-}
-
-/**
- * @brief Pack a state_correction message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param xErr x position error
- * @param yErr y position error
- * @param zErr z position error
- * @param rollErr roll error (radians)
- * @param pitchErr pitch error (radians)
- * @param yawErr yaw error (radians)
- * @param vxErr x velocity
- * @param vyErr y velocity
- * @param vzErr z velocity
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_state_correction_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float xErr,float yErr,float zErr,float rollErr,float pitchErr,float yawErr,float vxErr,float vyErr,float vzErr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, xErr);
-	_mav_put_float(buf, 4, yErr);
-	_mav_put_float(buf, 8, zErr);
-	_mav_put_float(buf, 12, rollErr);
-	_mav_put_float(buf, 16, pitchErr);
-	_mav_put_float(buf, 20, yawErr);
-	_mav_put_float(buf, 24, vxErr);
-	_mav_put_float(buf, 28, vyErr);
-	_mav_put_float(buf, 32, vzErr);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_state_correction_t packet;
-	packet.xErr = xErr;
-	packet.yErr = yErr;
-	packet.zErr = zErr;
-	packet.rollErr = rollErr;
-	packet.pitchErr = pitchErr;
-	packet.yawErr = yawErr;
-	packet.vxErr = vxErr;
-	packet.vyErr = vyErr;
-	packet.vzErr = vzErr;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_STATE_CORRECTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 36);
-}
-
-/**
- * @brief Encode a state_correction struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param state_correction C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_state_correction_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_state_correction_t* state_correction)
-{
-	return mavlink_msg_state_correction_pack(system_id, component_id, msg, state_correction->xErr, state_correction->yErr, state_correction->zErr, state_correction->rollErr, state_correction->pitchErr, state_correction->yawErr, state_correction->vxErr, state_correction->vyErr, state_correction->vzErr);
-}
-
-/**
- * @brief Send a state_correction message
- * @param chan MAVLink channel to send the message
- *
- * @param xErr x position error
- * @param yErr y position error
- * @param zErr z position error
- * @param rollErr roll error (radians)
- * @param pitchErr pitch error (radians)
- * @param yawErr yaw error (radians)
- * @param vxErr x velocity
- * @param vyErr y velocity
- * @param vzErr z velocity
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_state_correction_send(mavlink_channel_t chan, float xErr, float yErr, float zErr, float rollErr, float pitchErr, float yawErr, float vxErr, float vyErr, float vzErr)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_float(buf, 0, xErr);
-	_mav_put_float(buf, 4, yErr);
-	_mav_put_float(buf, 8, zErr);
-	_mav_put_float(buf, 12, rollErr);
-	_mav_put_float(buf, 16, pitchErr);
-	_mav_put_float(buf, 20, yawErr);
-	_mav_put_float(buf, 24, vxErr);
-	_mav_put_float(buf, 28, vyErr);
-	_mav_put_float(buf, 32, vzErr);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_STATE_CORRECTION, buf, 36);
-#else
-	mavlink_state_correction_t packet;
-	packet.xErr = xErr;
-	packet.yErr = yErr;
-	packet.zErr = zErr;
-	packet.rollErr = rollErr;
-	packet.pitchErr = pitchErr;
-	packet.yawErr = yawErr;
-	packet.vxErr = vxErr;
-	packet.vyErr = vyErr;
-	packet.vzErr = vzErr;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_STATE_CORRECTION, (const char *)&packet, 36);
-#endif
-}
-
-#endif
-
-// MESSAGE STATE_CORRECTION UNPACKING
-
-
-/**
- * @brief Get field xErr from state_correction message
- *
- * @return x position error
- */
-static inline float mavlink_msg_state_correction_get_xErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field yErr from state_correction message
- *
- * @return y position error
- */
-static inline float mavlink_msg_state_correction_get_yErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field zErr from state_correction message
- *
- * @return z position error
- */
-static inline float mavlink_msg_state_correction_get_zErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field rollErr from state_correction message
- *
- * @return roll error (radians)
- */
-static inline float mavlink_msg_state_correction_get_rollErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field pitchErr from state_correction message
- *
- * @return pitch error (radians)
- */
-static inline float mavlink_msg_state_correction_get_pitchErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field yawErr from state_correction message
- *
- * @return yaw error (radians)
- */
-static inline float mavlink_msg_state_correction_get_yawErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field vxErr from state_correction message
- *
- * @return x velocity
- */
-static inline float mavlink_msg_state_correction_get_vxErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field vyErr from state_correction message
- *
- * @return y velocity
- */
-static inline float mavlink_msg_state_correction_get_vyErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field vzErr from state_correction message
- *
- * @return z velocity
- */
-static inline float mavlink_msg_state_correction_get_vzErr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Decode a state_correction message into a struct
- *
- * @param msg The message to decode
- * @param state_correction C-struct to decode the message contents into
- */
-static inline void mavlink_msg_state_correction_decode(const mavlink_message_t* msg, mavlink_state_correction_t* state_correction)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	state_correction->xErr = mavlink_msg_state_correction_get_xErr(msg);
-	state_correction->yErr = mavlink_msg_state_correction_get_yErr(msg);
-	state_correction->zErr = mavlink_msg_state_correction_get_zErr(msg);
-	state_correction->rollErr = mavlink_msg_state_correction_get_rollErr(msg);
-	state_correction->pitchErr = mavlink_msg_state_correction_get_pitchErr(msg);
-	state_correction->yawErr = mavlink_msg_state_correction_get_yawErr(msg);
-	state_correction->vxErr = mavlink_msg_state_correction_get_vxErr(msg);
-	state_correction->vyErr = mavlink_msg_state_correction_get_vyErr(msg);
-	state_correction->vzErr = mavlink_msg_state_correction_get_vzErr(msg);
-#else
-	memcpy(state_correction, _MAV_PAYLOAD(msg), 36);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_statustext.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_statustext.h
deleted file mode 100644
index c65f629e9..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_statustext.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// MESSAGE STATUSTEXT PACKING
-
-#define MAVLINK_MSG_ID_STATUSTEXT 254
-
-typedef struct __mavlink_statustext_t
-{
- uint8_t severity; ///< Severity of status, 0 = info message, 255 = critical fault
- int8_t text[50]; ///< Status text message, without null termination character
-} mavlink_statustext_t;
-
-#define MAVLINK_MSG_ID_STATUSTEXT_LEN 51
-#define MAVLINK_MSG_ID_254_LEN 51
-
-#define MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN 50
-
-#define MAVLINK_MESSAGE_INFO_STATUSTEXT { \
-	"STATUSTEXT", \
-	2, \
-	{  { "severity", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_statustext_t, severity) }, \
-         { "text", NULL, MAVLINK_TYPE_INT8_T, 50, 1, offsetof(mavlink_statustext_t, text) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a statustext message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param severity Severity of status, 0 = info message, 255 = critical fault
- * @param text Status text message, without null termination character
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_statustext_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t severity, const int8_t *text)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[51];
-	_mav_put_uint8_t(buf, 0, severity);
-	_mav_put_int8_t_array(buf, 1, text, 50);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 51);
-#else
-	mavlink_statustext_t packet;
-	packet.severity = severity;
-	mav_array_memcpy(packet.text, text, sizeof(int8_t)*50);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 51);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_STATUSTEXT;
-	return mavlink_finalize_message(msg, system_id, component_id, 51);
-}
-
-/**
- * @brief Pack a statustext message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param severity Severity of status, 0 = info message, 255 = critical fault
- * @param text Status text message, without null termination character
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_statustext_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t severity,const int8_t *text)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[51];
-	_mav_put_uint8_t(buf, 0, severity);
-	_mav_put_int8_t_array(buf, 1, text, 50);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 51);
-#else
-	mavlink_statustext_t packet;
-	packet.severity = severity;
-	mav_array_memcpy(packet.text, text, sizeof(int8_t)*50);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 51);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_STATUSTEXT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 51);
-}
-
-/**
- * @brief Encode a statustext struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param statustext C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_statustext_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_statustext_t* statustext)
-{
-	return mavlink_msg_statustext_pack(system_id, component_id, msg, statustext->severity, statustext->text);
-}
-
-/**
- * @brief Send a statustext message
- * @param chan MAVLink channel to send the message
- *
- * @param severity Severity of status, 0 = info message, 255 = critical fault
- * @param text Status text message, without null termination character
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_statustext_send(mavlink_channel_t chan, uint8_t severity, const int8_t *text)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[51];
-	_mav_put_uint8_t(buf, 0, severity);
-	_mav_put_int8_t_array(buf, 1, text, 50);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_STATUSTEXT, buf, 51);
-#else
-	mavlink_statustext_t packet;
-	packet.severity = severity;
-	mav_array_memcpy(packet.text, text, sizeof(int8_t)*50);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_STATUSTEXT, (const char *)&packet, 51);
-#endif
-}
-
-#endif
-
-// MESSAGE STATUSTEXT UNPACKING
-
-
-/**
- * @brief Get field severity from statustext message
- *
- * @return Severity of status, 0 = info message, 255 = critical fault
- */
-static inline uint8_t mavlink_msg_statustext_get_severity(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field text from statustext message
- *
- * @return Status text message, without null termination character
- */
-static inline uint16_t mavlink_msg_statustext_get_text(const mavlink_message_t* msg, int8_t *text)
-{
-	return _MAV_RETURN_int8_t_array(msg, text, 50,  1);
-}
-
-/**
- * @brief Decode a statustext message into a struct
- *
- * @param msg The message to decode
- * @param statustext C-struct to decode the message contents into
- */
-static inline void mavlink_msg_statustext_decode(const mavlink_message_t* msg, mavlink_statustext_t* statustext)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	statustext->severity = mavlink_msg_statustext_get_severity(msg);
-	mavlink_msg_statustext_get_text(msg, statustext->text);
-#else
-	memcpy(statustext, _MAV_PAYLOAD(msg), 51);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_sys_status.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_sys_status.h
deleted file mode 100644
index 1217ea60e..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_sys_status.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE SYS_STATUS PACKING
-
-#define MAVLINK_MSG_ID_SYS_STATUS 34
-
-typedef struct __mavlink_sys_status_t
-{
- uint8_t mode; ///< System mode, see MAV_MODE ENUM in mavlink/include/mavlink_types.h
- uint8_t nav_mode; ///< Navigation mode, see MAV_NAV_MODE ENUM
- uint8_t status; ///< System status flag, see MAV_STATUS ENUM
- uint16_t load; ///< Maximum usage in percent of the mainloop time, (0%: 0, 100%: 1000) should be always below 1000
- uint16_t vbat; ///< Battery voltage, in millivolts (1 = 1 millivolt)
- uint16_t battery_remaining; ///< Remaining battery energy: (0%: 0, 100%: 1000)
- uint16_t packet_drop; ///< Dropped packets (packets that were corrupted on reception on the MAV)
-} mavlink_sys_status_t;
-
-#define MAVLINK_MSG_ID_SYS_STATUS_LEN 11
-#define MAVLINK_MSG_ID_34_LEN 11
-
-
-
-#define MAVLINK_MESSAGE_INFO_SYS_STATUS { \
-	"SYS_STATUS", \
-	7, \
-	{  { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_sys_status_t, mode) }, \
-         { "nav_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_sys_status_t, nav_mode) }, \
-         { "status", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_sys_status_t, status) }, \
-         { "load", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_sys_status_t, load) }, \
-         { "vbat", NULL, MAVLINK_TYPE_UINT16_T, 0, 5, offsetof(mavlink_sys_status_t, vbat) }, \
-         { "battery_remaining", NULL, MAVLINK_TYPE_UINT16_T, 0, 7, offsetof(mavlink_sys_status_t, battery_remaining) }, \
-         { "packet_drop", NULL, MAVLINK_TYPE_UINT16_T, 0, 9, offsetof(mavlink_sys_status_t, packet_drop) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a sys_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param mode System mode, see MAV_MODE ENUM in mavlink/include/mavlink_types.h
- * @param nav_mode Navigation mode, see MAV_NAV_MODE ENUM
- * @param status System status flag, see MAV_STATUS ENUM
- * @param load Maximum usage in percent of the mainloop time, (0%: 0, 100%: 1000) should be always below 1000
- * @param vbat Battery voltage, in millivolts (1 = 1 millivolt)
- * @param battery_remaining Remaining battery energy: (0%: 0, 100%: 1000)
- * @param packet_drop Dropped packets (packets that were corrupted on reception on the MAV)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sys_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t mode, uint8_t nav_mode, uint8_t status, uint16_t load, uint16_t vbat, uint16_t battery_remaining, uint16_t packet_drop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, status);
-	_mav_put_uint16_t(buf, 3, load);
-	_mav_put_uint16_t(buf, 5, vbat);
-	_mav_put_uint16_t(buf, 7, battery_remaining);
-	_mav_put_uint16_t(buf, 9, packet_drop);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
-#else
-	mavlink_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.status = status;
-	packet.load = load;
-	packet.vbat = vbat;
-	packet.battery_remaining = battery_remaining;
-	packet.packet_drop = packet_drop;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYS_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 11);
-}
-
-/**
- * @brief Pack a sys_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param mode System mode, see MAV_MODE ENUM in mavlink/include/mavlink_types.h
- * @param nav_mode Navigation mode, see MAV_NAV_MODE ENUM
- * @param status System status flag, see MAV_STATUS ENUM
- * @param load Maximum usage in percent of the mainloop time, (0%: 0, 100%: 1000) should be always below 1000
- * @param vbat Battery voltage, in millivolts (1 = 1 millivolt)
- * @param battery_remaining Remaining battery energy: (0%: 0, 100%: 1000)
- * @param packet_drop Dropped packets (packets that were corrupted on reception on the MAV)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sys_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t mode,uint8_t nav_mode,uint8_t status,uint16_t load,uint16_t vbat,uint16_t battery_remaining,uint16_t packet_drop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, status);
-	_mav_put_uint16_t(buf, 3, load);
-	_mav_put_uint16_t(buf, 5, vbat);
-	_mav_put_uint16_t(buf, 7, battery_remaining);
-	_mav_put_uint16_t(buf, 9, packet_drop);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
-#else
-	mavlink_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.status = status;
-	packet.load = load;
-	packet.vbat = vbat;
-	packet.battery_remaining = battery_remaining;
-	packet.packet_drop = packet_drop;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYS_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 11);
-}
-
-/**
- * @brief Encode a sys_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param sys_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_sys_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_sys_status_t* sys_status)
-{
-	return mavlink_msg_sys_status_pack(system_id, component_id, msg, sys_status->mode, sys_status->nav_mode, sys_status->status, sys_status->load, sys_status->vbat, sys_status->battery_remaining, sys_status->packet_drop);
-}
-
-/**
- * @brief Send a sys_status message
- * @param chan MAVLink channel to send the message
- *
- * @param mode System mode, see MAV_MODE ENUM in mavlink/include/mavlink_types.h
- * @param nav_mode Navigation mode, see MAV_NAV_MODE ENUM
- * @param status System status flag, see MAV_STATUS ENUM
- * @param load Maximum usage in percent of the mainloop time, (0%: 0, 100%: 1000) should be always below 1000
- * @param vbat Battery voltage, in millivolts (1 = 1 millivolt)
- * @param battery_remaining Remaining battery energy: (0%: 0, 100%: 1000)
- * @param packet_drop Dropped packets (packets that were corrupted on reception on the MAV)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_sys_status_send(mavlink_channel_t chan, uint8_t mode, uint8_t nav_mode, uint8_t status, uint16_t load, uint16_t vbat, uint16_t battery_remaining, uint16_t packet_drop)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, status);
-	_mav_put_uint16_t(buf, 3, load);
-	_mav_put_uint16_t(buf, 5, vbat);
-	_mav_put_uint16_t(buf, 7, battery_remaining);
-	_mav_put_uint16_t(buf, 9, packet_drop);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYS_STATUS, buf, 11);
-#else
-	mavlink_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.status = status;
-	packet.load = load;
-	packet.vbat = vbat;
-	packet.battery_remaining = battery_remaining;
-	packet.packet_drop = packet_drop;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYS_STATUS, (const char *)&packet, 11);
-#endif
-}
-
-#endif
-
-// MESSAGE SYS_STATUS UNPACKING
-
-
-/**
- * @brief Get field mode from sys_status message
- *
- * @return System mode, see MAV_MODE ENUM in mavlink/include/mavlink_types.h
- */
-static inline uint8_t mavlink_msg_sys_status_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field nav_mode from sys_status message
- *
- * @return Navigation mode, see MAV_NAV_MODE ENUM
- */
-static inline uint8_t mavlink_msg_sys_status_get_nav_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field status from sys_status message
- *
- * @return System status flag, see MAV_STATUS ENUM
- */
-static inline uint8_t mavlink_msg_sys_status_get_status(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field load from sys_status message
- *
- * @return Maximum usage in percent of the mainloop time, (0%: 0, 100%: 1000) should be always below 1000
- */
-static inline uint16_t mavlink_msg_sys_status_get_load(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field vbat from sys_status message
- *
- * @return Battery voltage, in millivolts (1 = 1 millivolt)
- */
-static inline uint16_t mavlink_msg_sys_status_get_vbat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  5);
-}
-
-/**
- * @brief Get field battery_remaining from sys_status message
- *
- * @return Remaining battery energy: (0%: 0, 100%: 1000)
- */
-static inline uint16_t mavlink_msg_sys_status_get_battery_remaining(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  7);
-}
-
-/**
- * @brief Get field packet_drop from sys_status message
- *
- * @return Dropped packets (packets that were corrupted on reception on the MAV)
- */
-static inline uint16_t mavlink_msg_sys_status_get_packet_drop(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  9);
-}
-
-/**
- * @brief Decode a sys_status message into a struct
- *
- * @param msg The message to decode
- * @param sys_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_sys_status_decode(const mavlink_message_t* msg, mavlink_sys_status_t* sys_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	sys_status->mode = mavlink_msg_sys_status_get_mode(msg);
-	sys_status->nav_mode = mavlink_msg_sys_status_get_nav_mode(msg);
-	sys_status->status = mavlink_msg_sys_status_get_status(msg);
-	sys_status->load = mavlink_msg_sys_status_get_load(msg);
-	sys_status->vbat = mavlink_msg_sys_status_get_vbat(msg);
-	sys_status->battery_remaining = mavlink_msg_sys_status_get_battery_remaining(msg);
-	sys_status->packet_drop = mavlink_msg_sys_status_get_packet_drop(msg);
-#else
-	memcpy(sys_status, _MAV_PAYLOAD(msg), 11);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time.h
deleted file mode 100644
index 362586a70..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE SYSTEM_TIME PACKING
-
-#define MAVLINK_MSG_ID_SYSTEM_TIME 2
-
-typedef struct __mavlink_system_time_t
-{
- uint64_t time_usec; ///< Timestamp of the master clock in microseconds since UNIX epoch.
-} mavlink_system_time_t;
-
-#define MAVLINK_MSG_ID_SYSTEM_TIME_LEN 8
-#define MAVLINK_MSG_ID_2_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_SYSTEM_TIME { \
-	"SYSTEM_TIME", \
-	1, \
-	{  { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_system_time_t, time_usec) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a system_time message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param time_usec Timestamp of the master clock in microseconds since UNIX epoch.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_system_time_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t time_usec)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint64_t(buf, 0, time_usec);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_system_time_t packet;
-	packet.time_usec = time_usec;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYSTEM_TIME;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a system_time message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param time_usec Timestamp of the master clock in microseconds since UNIX epoch.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_system_time_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t time_usec)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint64_t(buf, 0, time_usec);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_system_time_t packet;
-	packet.time_usec = time_usec;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYSTEM_TIME;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a system_time struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param system_time C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_system_time_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_system_time_t* system_time)
-{
-	return mavlink_msg_system_time_pack(system_id, component_id, msg, system_time->time_usec);
-}
-
-/**
- * @brief Send a system_time message
- * @param chan MAVLink channel to send the message
- *
- * @param time_usec Timestamp of the master clock in microseconds since UNIX epoch.
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_system_time_send(mavlink_channel_t chan, uint64_t time_usec)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint64_t(buf, 0, time_usec);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYSTEM_TIME, buf, 8);
-#else
-	mavlink_system_time_t packet;
-	packet.time_usec = time_usec;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYSTEM_TIME, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE SYSTEM_TIME UNPACKING
-
-
-/**
- * @brief Get field time_usec from system_time message
- *
- * @return Timestamp of the master clock in microseconds since UNIX epoch.
- */
-static inline uint64_t mavlink_msg_system_time_get_time_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Decode a system_time message into a struct
- *
- * @param msg The message to decode
- * @param system_time C-struct to decode the message contents into
- */
-static inline void mavlink_msg_system_time_decode(const mavlink_message_t* msg, mavlink_system_time_t* system_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	system_time->time_usec = mavlink_msg_system_time_get_time_usec(msg);
-#else
-	memcpy(system_time, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time_utc.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time_utc.h
deleted file mode 100644
index 5688435d5..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_system_time_utc.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE SYSTEM_TIME_UTC PACKING
-
-#define MAVLINK_MSG_ID_SYSTEM_TIME_UTC 4
-
-typedef struct __mavlink_system_time_utc_t
-{
- uint32_t utc_date; ///< GPS UTC date ddmmyy
- uint32_t utc_time; ///< GPS UTC time hhmmss
-} mavlink_system_time_utc_t;
-
-#define MAVLINK_MSG_ID_SYSTEM_TIME_UTC_LEN 8
-#define MAVLINK_MSG_ID_4_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC { \
-	"SYSTEM_TIME_UTC", \
-	2, \
-	{  { "utc_date", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_system_time_utc_t, utc_date) }, \
-         { "utc_time", NULL, MAVLINK_TYPE_UINT32_T, 0, 4, offsetof(mavlink_system_time_utc_t, utc_time) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a system_time_utc message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param utc_date GPS UTC date ddmmyy
- * @param utc_time GPS UTC time hhmmss
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_system_time_utc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint32_t utc_date, uint32_t utc_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint32_t(buf, 0, utc_date);
-	_mav_put_uint32_t(buf, 4, utc_time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_system_time_utc_t packet;
-	packet.utc_date = utc_date;
-	packet.utc_time = utc_time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYSTEM_TIME_UTC;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a system_time_utc message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param utc_date GPS UTC date ddmmyy
- * @param utc_time GPS UTC time hhmmss
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_system_time_utc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint32_t utc_date,uint32_t utc_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint32_t(buf, 0, utc_date);
-	_mav_put_uint32_t(buf, 4, utc_time);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_system_time_utc_t packet;
-	packet.utc_date = utc_date;
-	packet.utc_time = utc_time;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SYSTEM_TIME_UTC;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a system_time_utc struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param system_time_utc C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_system_time_utc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_system_time_utc_t* system_time_utc)
-{
-	return mavlink_msg_system_time_utc_pack(system_id, component_id, msg, system_time_utc->utc_date, system_time_utc->utc_time);
-}
-
-/**
- * @brief Send a system_time_utc message
- * @param chan MAVLink channel to send the message
- *
- * @param utc_date GPS UTC date ddmmyy
- * @param utc_time GPS UTC time hhmmss
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_system_time_utc_send(mavlink_channel_t chan, uint32_t utc_date, uint32_t utc_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint32_t(buf, 0, utc_date);
-	_mav_put_uint32_t(buf, 4, utc_time);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYSTEM_TIME_UTC, buf, 8);
-#else
-	mavlink_system_time_utc_t packet;
-	packet.utc_date = utc_date;
-	packet.utc_time = utc_time;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SYSTEM_TIME_UTC, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE SYSTEM_TIME_UTC UNPACKING
-
-
-/**
- * @brief Get field utc_date from system_time_utc message
- *
- * @return GPS UTC date ddmmyy
- */
-static inline uint32_t mavlink_msg_system_time_utc_get_utc_date(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Get field utc_time from system_time_utc message
- *
- * @return GPS UTC time hhmmss
- */
-static inline uint32_t mavlink_msg_system_time_utc_get_utc_time(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  4);
-}
-
-/**
- * @brief Decode a system_time_utc message into a struct
- *
- * @param msg The message to decode
- * @param system_time_utc C-struct to decode the message contents into
- */
-static inline void mavlink_msg_system_time_utc_decode(const mavlink_message_t* msg, mavlink_system_time_utc_t* system_time_utc)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	system_time_utc->utc_date = mavlink_msg_system_time_utc_get_utc_date(msg);
-	system_time_utc->utc_time = mavlink_msg_system_time_utc_get_utc_time(msg);
-#else
-	memcpy(system_time_utc, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_vfr_hud.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_vfr_hud.h
deleted file mode 100644
index 0f92de775..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_vfr_hud.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE VFR_HUD PACKING
-
-#define MAVLINK_MSG_ID_VFR_HUD 74
-
-typedef struct __mavlink_vfr_hud_t
-{
- float airspeed; ///< Current airspeed in m/s
- float groundspeed; ///< Current ground speed in m/s
- int16_t heading; ///< Current heading in degrees, in compass units (0..360, 0=north)
- uint16_t throttle; ///< Current throttle setting in integer percent, 0 to 100
- float alt; ///< Current altitude (MSL), in meters
- float climb; ///< Current climb rate in meters/second
-} mavlink_vfr_hud_t;
-
-#define MAVLINK_MSG_ID_VFR_HUD_LEN 20
-#define MAVLINK_MSG_ID_74_LEN 20
-
-
-
-#define MAVLINK_MESSAGE_INFO_VFR_HUD { \
-	"VFR_HUD", \
-	6, \
-	{  { "airspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_vfr_hud_t, airspeed) }, \
-         { "groundspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_vfr_hud_t, groundspeed) }, \
-         { "heading", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_vfr_hud_t, heading) }, \
-         { "throttle", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_vfr_hud_t, throttle) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_vfr_hud_t, alt) }, \
-         { "climb", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_vfr_hud_t, climb) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a vfr_hud message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param airspeed Current airspeed in m/s
- * @param groundspeed Current ground speed in m/s
- * @param heading Current heading in degrees, in compass units (0..360, 0=north)
- * @param throttle Current throttle setting in integer percent, 0 to 100
- * @param alt Current altitude (MSL), in meters
- * @param climb Current climb rate in meters/second
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vfr_hud_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float airspeed, float groundspeed, int16_t heading, uint16_t throttle, float alt, float climb)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, airspeed);
-	_mav_put_float(buf, 4, groundspeed);
-	_mav_put_int16_t(buf, 8, heading);
-	_mav_put_uint16_t(buf, 10, throttle);
-	_mav_put_float(buf, 12, alt);
-	_mav_put_float(buf, 16, climb);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_vfr_hud_t packet;
-	packet.airspeed = airspeed;
-	packet.groundspeed = groundspeed;
-	packet.heading = heading;
-	packet.throttle = throttle;
-	packet.alt = alt;
-	packet.climb = climb;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VFR_HUD;
-	return mavlink_finalize_message(msg, system_id, component_id, 20);
-}
-
-/**
- * @brief Pack a vfr_hud message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param airspeed Current airspeed in m/s
- * @param groundspeed Current ground speed in m/s
- * @param heading Current heading in degrees, in compass units (0..360, 0=north)
- * @param throttle Current throttle setting in integer percent, 0 to 100
- * @param alt Current altitude (MSL), in meters
- * @param climb Current climb rate in meters/second
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vfr_hud_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float airspeed,float groundspeed,int16_t heading,uint16_t throttle,float alt,float climb)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, airspeed);
-	_mav_put_float(buf, 4, groundspeed);
-	_mav_put_int16_t(buf, 8, heading);
-	_mav_put_uint16_t(buf, 10, throttle);
-	_mav_put_float(buf, 12, alt);
-	_mav_put_float(buf, 16, climb);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_vfr_hud_t packet;
-	packet.airspeed = airspeed;
-	packet.groundspeed = groundspeed;
-	packet.heading = heading;
-	packet.throttle = throttle;
-	packet.alt = alt;
-	packet.climb = climb;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VFR_HUD;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20);
-}
-
-/**
- * @brief Encode a vfr_hud struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param vfr_hud C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_vfr_hud_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vfr_hud_t* vfr_hud)
-{
-	return mavlink_msg_vfr_hud_pack(system_id, component_id, msg, vfr_hud->airspeed, vfr_hud->groundspeed, vfr_hud->heading, vfr_hud->throttle, vfr_hud->alt, vfr_hud->climb);
-}
-
-/**
- * @brief Send a vfr_hud message
- * @param chan MAVLink channel to send the message
- *
- * @param airspeed Current airspeed in m/s
- * @param groundspeed Current ground speed in m/s
- * @param heading Current heading in degrees, in compass units (0..360, 0=north)
- * @param throttle Current throttle setting in integer percent, 0 to 100
- * @param alt Current altitude (MSL), in meters
- * @param climb Current climb rate in meters/second
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_vfr_hud_send(mavlink_channel_t chan, float airspeed, float groundspeed, int16_t heading, uint16_t throttle, float alt, float climb)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, airspeed);
-	_mav_put_float(buf, 4, groundspeed);
-	_mav_put_int16_t(buf, 8, heading);
-	_mav_put_uint16_t(buf, 10, throttle);
-	_mav_put_float(buf, 12, alt);
-	_mav_put_float(buf, 16, climb);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VFR_HUD, buf, 20);
-#else
-	mavlink_vfr_hud_t packet;
-	packet.airspeed = airspeed;
-	packet.groundspeed = groundspeed;
-	packet.heading = heading;
-	packet.throttle = throttle;
-	packet.alt = alt;
-	packet.climb = climb;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VFR_HUD, (const char *)&packet, 20);
-#endif
-}
-
-#endif
-
-// MESSAGE VFR_HUD UNPACKING
-
-
-/**
- * @brief Get field airspeed from vfr_hud message
- *
- * @return Current airspeed in m/s
- */
-static inline float mavlink_msg_vfr_hud_get_airspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field groundspeed from vfr_hud message
- *
- * @return Current ground speed in m/s
- */
-static inline float mavlink_msg_vfr_hud_get_groundspeed(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field heading from vfr_hud message
- *
- * @return Current heading in degrees, in compass units (0..360, 0=north)
- */
-static inline int16_t mavlink_msg_vfr_hud_get_heading(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  8);
-}
-
-/**
- * @brief Get field throttle from vfr_hud message
- *
- * @return Current throttle setting in integer percent, 0 to 100
- */
-static inline uint16_t mavlink_msg_vfr_hud_get_throttle(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Get field alt from vfr_hud message
- *
- * @return Current altitude (MSL), in meters
- */
-static inline float mavlink_msg_vfr_hud_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field climb from vfr_hud message
- *
- * @return Current climb rate in meters/second
- */
-static inline float mavlink_msg_vfr_hud_get_climb(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Decode a vfr_hud message into a struct
- *
- * @param msg The message to decode
- * @param vfr_hud C-struct to decode the message contents into
- */
-static inline void mavlink_msg_vfr_hud_decode(const mavlink_message_t* msg, mavlink_vfr_hud_t* vfr_hud)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	vfr_hud->airspeed = mavlink_msg_vfr_hud_get_airspeed(msg);
-	vfr_hud->groundspeed = mavlink_msg_vfr_hud_get_groundspeed(msg);
-	vfr_hud->heading = mavlink_msg_vfr_hud_get_heading(msg);
-	vfr_hud->throttle = mavlink_msg_vfr_hud_get_throttle(msg);
-	vfr_hud->alt = mavlink_msg_vfr_hud_get_alt(msg);
-	vfr_hud->climb = mavlink_msg_vfr_hud_get_climb(msg);
-#else
-	memcpy(vfr_hud, _MAV_PAYLOAD(msg), 20);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint.h
deleted file mode 100644
index d9b21e3c9..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint.h
+++ /dev/null
@@ -1,430 +0,0 @@
-// MESSAGE WAYPOINT PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT 39
-
-typedef struct __mavlink_waypoint_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t seq; ///< Sequence
- uint8_t frame; ///< The coordinate system of the waypoint. see MAV_FRAME in mavlink_types.h
- uint8_t command; ///< The scheduled action for the waypoint. see MAV_COMMAND in common.xml MAVLink specs
- uint8_t current; ///< false:0, true:1
- uint8_t autocontinue; ///< autocontinue to next wp
- float param1; ///< PARAM1 / For NAV command waypoints: Radius in which the waypoint is accepted as reached, in meters
- float param2; ///< PARAM2 / For NAV command waypoints: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds
- float param3; ///< PARAM3 / For LOITER command waypoints: Orbit to circle around the waypoint, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.
- float param4; ///< PARAM4 / For NAV and LOITER command waypoints: Yaw orientation in degrees, [0..360] 0 = NORTH
- float x; ///< PARAM5 / local: x position, global: latitude
- float y; ///< PARAM6 / y position: global: longitude
- float z; ///< PARAM7 / z position: global: altitude
-} mavlink_waypoint_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_LEN 36
-#define MAVLINK_MSG_ID_39_LEN 36
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT { \
-	"WAYPOINT", \
-	14, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_t, target_component) }, \
-         { "seq", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_waypoint_t, seq) }, \
-         { "frame", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_waypoint_t, frame) }, \
-         { "command", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_waypoint_t, command) }, \
-         { "current", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_waypoint_t, current) }, \
-         { "autocontinue", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_waypoint_t, autocontinue) }, \
-         { "param1", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_waypoint_t, param1) }, \
-         { "param2", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_waypoint_t, param2) }, \
-         { "param3", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_waypoint_t, param3) }, \
-         { "param4", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_waypoint_t, param4) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_waypoint_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_waypoint_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_waypoint_t, z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @param frame The coordinate system of the waypoint. see MAV_FRAME in mavlink_types.h
- * @param command The scheduled action for the waypoint. see MAV_COMMAND in common.xml MAVLink specs
- * @param current false:0, true:1
- * @param autocontinue autocontinue to next wp
- * @param param1 PARAM1 / For NAV command waypoints: Radius in which the waypoint is accepted as reached, in meters
- * @param param2 PARAM2 / For NAV command waypoints: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds
- * @param param3 PARAM3 / For LOITER command waypoints: Orbit to circle around the waypoint, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.
- * @param param4 PARAM4 / For NAV and LOITER command waypoints: Yaw orientation in degrees, [0..360] 0 = NORTH
- * @param x PARAM5 / local: x position, global: latitude
- * @param y PARAM6 / y position: global: longitude
- * @param z PARAM7 / z position: global: altitude
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t seq, uint8_t frame, uint8_t command, uint8_t current, uint8_t autocontinue, float param1, float param2, float param3, float param4, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-	_mav_put_uint8_t(buf, 4, frame);
-	_mav_put_uint8_t(buf, 5, command);
-	_mav_put_uint8_t(buf, 6, current);
-	_mav_put_uint8_t(buf, 7, autocontinue);
-	_mav_put_float(buf, 8, param1);
-	_mav_put_float(buf, 12, param2);
-	_mav_put_float(buf, 16, param3);
-	_mav_put_float(buf, 20, param4);
-	_mav_put_float(buf, 24, x);
-	_mav_put_float(buf, 28, y);
-	_mav_put_float(buf, 32, z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_waypoint_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-	packet.frame = frame;
-	packet.command = command;
-	packet.current = current;
-	packet.autocontinue = autocontinue;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 36);
-}
-
-/**
- * @brief Pack a waypoint message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @param frame The coordinate system of the waypoint. see MAV_FRAME in mavlink_types.h
- * @param command The scheduled action for the waypoint. see MAV_COMMAND in common.xml MAVLink specs
- * @param current false:0, true:1
- * @param autocontinue autocontinue to next wp
- * @param param1 PARAM1 / For NAV command waypoints: Radius in which the waypoint is accepted as reached, in meters
- * @param param2 PARAM2 / For NAV command waypoints: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds
- * @param param3 PARAM3 / For LOITER command waypoints: Orbit to circle around the waypoint, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.
- * @param param4 PARAM4 / For NAV and LOITER command waypoints: Yaw orientation in degrees, [0..360] 0 = NORTH
- * @param x PARAM5 / local: x position, global: latitude
- * @param y PARAM6 / y position: global: longitude
- * @param z PARAM7 / z position: global: altitude
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t seq,uint8_t frame,uint8_t command,uint8_t current,uint8_t autocontinue,float param1,float param2,float param3,float param4,float x,float y,float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-	_mav_put_uint8_t(buf, 4, frame);
-	_mav_put_uint8_t(buf, 5, command);
-	_mav_put_uint8_t(buf, 6, current);
-	_mav_put_uint8_t(buf, 7, autocontinue);
-	_mav_put_float(buf, 8, param1);
-	_mav_put_float(buf, 12, param2);
-	_mav_put_float(buf, 16, param3);
-	_mav_put_float(buf, 20, param4);
-	_mav_put_float(buf, 24, x);
-	_mav_put_float(buf, 28, y);
-	_mav_put_float(buf, 32, z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
-#else
-	mavlink_waypoint_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-	packet.frame = frame;
-	packet.command = command;
-	packet.current = current;
-	packet.autocontinue = autocontinue;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 36);
-}
-
-/**
- * @brief Encode a waypoint struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_t* waypoint)
-{
-	return mavlink_msg_waypoint_pack(system_id, component_id, msg, waypoint->target_system, waypoint->target_component, waypoint->seq, waypoint->frame, waypoint->command, waypoint->current, waypoint->autocontinue, waypoint->param1, waypoint->param2, waypoint->param3, waypoint->param4, waypoint->x, waypoint->y, waypoint->z);
-}
-
-/**
- * @brief Send a waypoint message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @param frame The coordinate system of the waypoint. see MAV_FRAME in mavlink_types.h
- * @param command The scheduled action for the waypoint. see MAV_COMMAND in common.xml MAVLink specs
- * @param current false:0, true:1
- * @param autocontinue autocontinue to next wp
- * @param param1 PARAM1 / For NAV command waypoints: Radius in which the waypoint is accepted as reached, in meters
- * @param param2 PARAM2 / For NAV command waypoints: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds
- * @param param3 PARAM3 / For LOITER command waypoints: Orbit to circle around the waypoint, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.
- * @param param4 PARAM4 / For NAV and LOITER command waypoints: Yaw orientation in degrees, [0..360] 0 = NORTH
- * @param x PARAM5 / local: x position, global: latitude
- * @param y PARAM6 / y position: global: longitude
- * @param z PARAM7 / z position: global: altitude
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t seq, uint8_t frame, uint8_t command, uint8_t current, uint8_t autocontinue, float param1, float param2, float param3, float param4, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-	_mav_put_uint8_t(buf, 4, frame);
-	_mav_put_uint8_t(buf, 5, command);
-	_mav_put_uint8_t(buf, 6, current);
-	_mav_put_uint8_t(buf, 7, autocontinue);
-	_mav_put_float(buf, 8, param1);
-	_mav_put_float(buf, 12, param2);
-	_mav_put_float(buf, 16, param3);
-	_mav_put_float(buf, 20, param4);
-	_mav_put_float(buf, 24, x);
-	_mav_put_float(buf, 28, y);
-	_mav_put_float(buf, 32, z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT, buf, 36);
-#else
-	mavlink_waypoint_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-	packet.frame = frame;
-	packet.command = command;
-	packet.current = current;
-	packet.autocontinue = autocontinue;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT, (const char *)&packet, 36);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field seq from waypoint message
- *
- * @return Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field frame from waypoint message
- *
- * @return The coordinate system of the waypoint. see MAV_FRAME in mavlink_types.h
- */
-static inline uint8_t mavlink_msg_waypoint_get_frame(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field command from waypoint message
- *
- * @return The scheduled action for the waypoint. see MAV_COMMAND in common.xml MAVLink specs
- */
-static inline uint8_t mavlink_msg_waypoint_get_command(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field current from waypoint message
- *
- * @return false:0, true:1
- */
-static inline uint8_t mavlink_msg_waypoint_get_current(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field autocontinue from waypoint message
- *
- * @return autocontinue to next wp
- */
-static inline uint8_t mavlink_msg_waypoint_get_autocontinue(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Get field param1 from waypoint message
- *
- * @return PARAM1 / For NAV command waypoints: Radius in which the waypoint is accepted as reached, in meters
- */
-static inline float mavlink_msg_waypoint_get_param1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field param2 from waypoint message
- *
- * @return PARAM2 / For NAV command waypoints: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds
- */
-static inline float mavlink_msg_waypoint_get_param2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field param3 from waypoint message
- *
- * @return PARAM3 / For LOITER command waypoints: Orbit to circle around the waypoint, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.
- */
-static inline float mavlink_msg_waypoint_get_param3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field param4 from waypoint message
- *
- * @return PARAM4 / For NAV and LOITER command waypoints: Yaw orientation in degrees, [0..360] 0 = NORTH
- */
-static inline float mavlink_msg_waypoint_get_param4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field x from waypoint message
- *
- * @return PARAM5 / local: x position, global: latitude
- */
-static inline float mavlink_msg_waypoint_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field y from waypoint message
- *
- * @return PARAM6 / y position: global: longitude
- */
-static inline float mavlink_msg_waypoint_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field z from waypoint message
- *
- * @return PARAM7 / z position: global: altitude
- */
-static inline float mavlink_msg_waypoint_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Decode a waypoint message into a struct
- *
- * @param msg The message to decode
- * @param waypoint C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_decode(const mavlink_message_t* msg, mavlink_waypoint_t* waypoint)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint->target_system = mavlink_msg_waypoint_get_target_system(msg);
-	waypoint->target_component = mavlink_msg_waypoint_get_target_component(msg);
-	waypoint->seq = mavlink_msg_waypoint_get_seq(msg);
-	waypoint->frame = mavlink_msg_waypoint_get_frame(msg);
-	waypoint->command = mavlink_msg_waypoint_get_command(msg);
-	waypoint->current = mavlink_msg_waypoint_get_current(msg);
-	waypoint->autocontinue = mavlink_msg_waypoint_get_autocontinue(msg);
-	waypoint->param1 = mavlink_msg_waypoint_get_param1(msg);
-	waypoint->param2 = mavlink_msg_waypoint_get_param2(msg);
-	waypoint->param3 = mavlink_msg_waypoint_get_param3(msg);
-	waypoint->param4 = mavlink_msg_waypoint_get_param4(msg);
-	waypoint->x = mavlink_msg_waypoint_get_x(msg);
-	waypoint->y = mavlink_msg_waypoint_get_y(msg);
-	waypoint->z = mavlink_msg_waypoint_get_z(msg);
-#else
-	memcpy(waypoint, _MAV_PAYLOAD(msg), 36);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_ack.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_ack.h
deleted file mode 100644
index ddba2adf4..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_ack.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE WAYPOINT_ACK PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_ACK 47
-
-typedef struct __mavlink_waypoint_ack_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint8_t type; ///< 0: OK, 1: Error
-} mavlink_waypoint_ack_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_ACK_LEN 3
-#define MAVLINK_MSG_ID_47_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_ACK { \
-	"WAYPOINT_ACK", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_ack_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_ack_t, target_component) }, \
-         { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_waypoint_ack_t, type) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_ack message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param type 0: OK, 1: Error
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_ack_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t type)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, type);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_waypoint_ack_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.type = type;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_ACK;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a waypoint_ack message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param type 0: OK, 1: Error
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_ack_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t type)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, type);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_waypoint_ack_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.type = type;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_ACK;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a waypoint_ack struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_ack C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_ack_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_ack_t* waypoint_ack)
-{
-	return mavlink_msg_waypoint_ack_pack(system_id, component_id, msg, waypoint_ack->target_system, waypoint_ack->target_component, waypoint_ack->type);
-}
-
-/**
- * @brief Send a waypoint_ack message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param type 0: OK, 1: Error
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_ack_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t type)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, type);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_ACK, buf, 3);
-#else
-	mavlink_waypoint_ack_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.type = type;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_ACK, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_ACK UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_ack message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_ack_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_ack message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_ack_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field type from waypoint_ack message
- *
- * @return 0: OK, 1: Error
- */
-static inline uint8_t mavlink_msg_waypoint_ack_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a waypoint_ack message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_ack C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_ack_decode(const mavlink_message_t* msg, mavlink_waypoint_ack_t* waypoint_ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_ack->target_system = mavlink_msg_waypoint_ack_get_target_system(msg);
-	waypoint_ack->target_component = mavlink_msg_waypoint_ack_get_target_component(msg);
-	waypoint_ack->type = mavlink_msg_waypoint_ack_get_type(msg);
-#else
-	memcpy(waypoint_ack, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_clear_all.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_clear_all.h
deleted file mode 100644
index 8eab44b26..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_clear_all.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE WAYPOINT_CLEAR_ALL PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL 45
-
-typedef struct __mavlink_waypoint_clear_all_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
-} mavlink_waypoint_clear_all_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL_LEN 2
-#define MAVLINK_MSG_ID_45_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL { \
-	"WAYPOINT_CLEAR_ALL", \
-	2, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_clear_all_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_clear_all_t, target_component) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_clear_all message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_clear_all_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_clear_all_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a waypoint_clear_all message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_clear_all_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_clear_all_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a waypoint_clear_all struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_clear_all C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_clear_all_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_clear_all_t* waypoint_clear_all)
-{
-	return mavlink_msg_waypoint_clear_all_pack(system_id, component_id, msg, waypoint_clear_all->target_system, waypoint_clear_all->target_component);
-}
-
-/**
- * @brief Send a waypoint_clear_all message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_clear_all_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL, buf, 2);
-#else
-	mavlink_waypoint_clear_all_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_CLEAR_ALL, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_CLEAR_ALL UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_clear_all message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_clear_all_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_clear_all message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_clear_all_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a waypoint_clear_all message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_clear_all C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_clear_all_decode(const mavlink_message_t* msg, mavlink_waypoint_clear_all_t* waypoint_clear_all)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_clear_all->target_system = mavlink_msg_waypoint_clear_all_get_target_system(msg);
-	waypoint_clear_all->target_component = mavlink_msg_waypoint_clear_all_get_target_component(msg);
-#else
-	memcpy(waypoint_clear_all, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_count.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_count.h
deleted file mode 100644
index af1dd382b..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_count.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE WAYPOINT_COUNT PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_COUNT 44
-
-typedef struct __mavlink_waypoint_count_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t count; ///< Number of Waypoints in the Sequence
-} mavlink_waypoint_count_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_COUNT_LEN 4
-#define MAVLINK_MSG_ID_44_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT { \
-	"WAYPOINT_COUNT", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_count_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_count_t, target_component) }, \
-         { "count", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_waypoint_count_t, count) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_count message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param count Number of Waypoints in the Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_count_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, count);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_count_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.count = count;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_COUNT;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a waypoint_count message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param count Number of Waypoints in the Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_count_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, count);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_count_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.count = count;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_COUNT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a waypoint_count struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_count C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_count_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_count_t* waypoint_count)
-{
-	return mavlink_msg_waypoint_count_pack(system_id, component_id, msg, waypoint_count->target_system, waypoint_count->target_component, waypoint_count->count);
-}
-
-/**
- * @brief Send a waypoint_count message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param count Number of Waypoints in the Sequence
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_count_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, count);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_COUNT, buf, 4);
-#else
-	mavlink_waypoint_count_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.count = count;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_COUNT, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_COUNT UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_count message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_count_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_count message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_count_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field count from waypoint_count message
- *
- * @return Number of Waypoints in the Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_count_get_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a waypoint_count message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_count C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_count_decode(const mavlink_message_t* msg, mavlink_waypoint_count_t* waypoint_count)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_count->target_system = mavlink_msg_waypoint_count_get_target_system(msg);
-	waypoint_count->target_component = mavlink_msg_waypoint_count_get_target_component(msg);
-	waypoint_count->count = mavlink_msg_waypoint_count_get_count(msg);
-#else
-	memcpy(waypoint_count, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_current.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_current.h
deleted file mode 100644
index a7e4557d6..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_current.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE WAYPOINT_CURRENT PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_CURRENT 42
-
-typedef struct __mavlink_waypoint_current_t
-{
- uint16_t seq; ///< Sequence
-} mavlink_waypoint_current_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_CURRENT_LEN 2
-#define MAVLINK_MSG_ID_42_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT { \
-	"WAYPOINT_CURRENT", \
-	1, \
-	{  { "seq", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_waypoint_current_t, seq) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_current message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_current_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_current_t packet;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_CURRENT;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a waypoint_current message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_current_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_current_t packet;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_CURRENT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a waypoint_current struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_current C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_current_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_current_t* waypoint_current)
-{
-	return mavlink_msg_waypoint_current_pack(system_id, component_id, msg, waypoint_current->seq);
-}
-
-/**
- * @brief Send a waypoint_current message
- * @param chan MAVLink channel to send the message
- *
- * @param seq Sequence
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_current_send(mavlink_channel_t chan, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_CURRENT, buf, 2);
-#else
-	mavlink_waypoint_current_t packet;
-	packet.seq = seq;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_CURRENT, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_CURRENT UNPACKING
-
-
-/**
- * @brief Get field seq from waypoint_current message
- *
- * @return Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_current_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Decode a waypoint_current message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_current C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_current_decode(const mavlink_message_t* msg, mavlink_waypoint_current_t* waypoint_current)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_current->seq = mavlink_msg_waypoint_current_get_seq(msg);
-#else
-	memcpy(waypoint_current, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_reached.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_reached.h
deleted file mode 100644
index d28dce149..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_reached.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE WAYPOINT_REACHED PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_REACHED 46
-
-typedef struct __mavlink_waypoint_reached_t
-{
- uint16_t seq; ///< Sequence
-} mavlink_waypoint_reached_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_REACHED_LEN 2
-#define MAVLINK_MSG_ID_46_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED { \
-	"WAYPOINT_REACHED", \
-	1, \
-	{  { "seq", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_waypoint_reached_t, seq) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_reached message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_reached_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_reached_t packet;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REACHED;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a waypoint_reached message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_reached_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_reached_t packet;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REACHED;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a waypoint_reached struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_reached C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_reached_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_reached_t* waypoint_reached)
-{
-	return mavlink_msg_waypoint_reached_pack(system_id, component_id, msg, waypoint_reached->seq);
-}
-
-/**
- * @brief Send a waypoint_reached message
- * @param chan MAVLink channel to send the message
- *
- * @param seq Sequence
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_reached_send(mavlink_channel_t chan, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint16_t(buf, 0, seq);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REACHED, buf, 2);
-#else
-	mavlink_waypoint_reached_t packet;
-	packet.seq = seq;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REACHED, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_REACHED UNPACKING
-
-
-/**
- * @brief Get field seq from waypoint_reached message
- *
- * @return Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_reached_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Decode a waypoint_reached message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_reached C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_reached_decode(const mavlink_message_t* msg, mavlink_waypoint_reached_t* waypoint_reached)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_reached->seq = mavlink_msg_waypoint_reached_get_seq(msg);
-#else
-	memcpy(waypoint_reached, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request.h
deleted file mode 100644
index 38167c080..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE WAYPOINT_REQUEST PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_REQUEST 40
-
-typedef struct __mavlink_waypoint_request_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t seq; ///< Sequence
-} mavlink_waypoint_request_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_REQUEST_LEN 4
-#define MAVLINK_MSG_ID_40_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST { \
-	"WAYPOINT_REQUEST", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_request_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_request_t, target_component) }, \
-         { "seq", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_waypoint_request_t, seq) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_request message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_request_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_request_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REQUEST;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a waypoint_request message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_request_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_request_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REQUEST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a waypoint_request struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_request C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_request_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_request_t* waypoint_request)
-{
-	return mavlink_msg_waypoint_request_pack(system_id, component_id, msg, waypoint_request->target_system, waypoint_request->target_component, waypoint_request->seq);
-}
-
-/**
- * @brief Send a waypoint_request message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_request_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REQUEST, buf, 4);
-#else
-	mavlink_waypoint_request_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REQUEST, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_REQUEST UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_request message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_request_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_request message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_request_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field seq from waypoint_request message
- *
- * @return Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_request_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a waypoint_request message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_request C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_request_decode(const mavlink_message_t* msg, mavlink_waypoint_request_t* waypoint_request)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_request->target_system = mavlink_msg_waypoint_request_get_target_system(msg);
-	waypoint_request->target_component = mavlink_msg_waypoint_request_get_target_component(msg);
-	waypoint_request->seq = mavlink_msg_waypoint_request_get_seq(msg);
-#else
-	memcpy(waypoint_request, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request_list.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request_list.h
deleted file mode 100644
index ba21fbc82..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_request_list.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE WAYPOINT_REQUEST_LIST PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST 43
-
-typedef struct __mavlink_waypoint_request_list_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
-} mavlink_waypoint_request_list_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST_LEN 2
-#define MAVLINK_MSG_ID_43_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST { \
-	"WAYPOINT_REQUEST_LIST", \
-	2, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_request_list_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_request_list_t, target_component) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_request_list message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_request_list_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST;
-	return mavlink_finalize_message(msg, system_id, component_id, 2);
-}
-
-/**
- * @brief Pack a waypoint_request_list message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_request_list_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 2);
-#else
-	mavlink_waypoint_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2);
-}
-
-/**
- * @brief Encode a waypoint_request_list struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_request_list C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_request_list_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_request_list_t* waypoint_request_list)
-{
-	return mavlink_msg_waypoint_request_list_pack(system_id, component_id, msg, waypoint_request_list->target_system, waypoint_request_list->target_component);
-}
-
-/**
- * @brief Send a waypoint_request_list message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_request_list_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST, buf, 2);
-#else
-	mavlink_waypoint_request_list_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_REQUEST_LIST, (const char *)&packet, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_REQUEST_LIST UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_request_list message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_request_list_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_request_list message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_request_list_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a waypoint_request_list message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_request_list C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_request_list_decode(const mavlink_message_t* msg, mavlink_waypoint_request_list_t* waypoint_request_list)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_request_list->target_system = mavlink_msg_waypoint_request_list_get_target_system(msg);
-	waypoint_request_list->target_component = mavlink_msg_waypoint_request_list_get_target_component(msg);
-#else
-	memcpy(waypoint_request_list, _MAV_PAYLOAD(msg), 2);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_set_current.h b/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_set_current.h
deleted file mode 100644
index f1ba68b45..000000000
--- a/mavlink/include/mavlink/v0.9/common/mavlink_msg_waypoint_set_current.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE WAYPOINT_SET_CURRENT PACKING
-
-#define MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT 41
-
-typedef struct __mavlink_waypoint_set_current_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t seq; ///< Sequence
-} mavlink_waypoint_set_current_t;
-
-#define MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT_LEN 4
-#define MAVLINK_MSG_ID_41_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT { \
-	"WAYPOINT_SET_CURRENT", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_waypoint_set_current_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_waypoint_set_current_t, target_component) }, \
-         { "seq", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_waypoint_set_current_t, seq) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a waypoint_set_current message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_set_current_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_set_current_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a waypoint_set_current message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_waypoint_set_current_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_waypoint_set_current_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a waypoint_set_current struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param waypoint_set_current C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_waypoint_set_current_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_waypoint_set_current_t* waypoint_set_current)
-{
-	return mavlink_msg_waypoint_set_current_pack(system_id, component_id, msg, waypoint_set_current->target_system, waypoint_set_current->target_component, waypoint_set_current->seq);
-}
-
-/**
- * @brief Send a waypoint_set_current message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param seq Sequence
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_waypoint_set_current_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t seq)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, seq);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT, buf, 4);
-#else
-	mavlink_waypoint_set_current_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.seq = seq;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WAYPOINT_SET_CURRENT, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE WAYPOINT_SET_CURRENT UNPACKING
-
-
-/**
- * @brief Get field target_system from waypoint_set_current message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_waypoint_set_current_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from waypoint_set_current message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_waypoint_set_current_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field seq from waypoint_set_current message
- *
- * @return Sequence
- */
-static inline uint16_t mavlink_msg_waypoint_set_current_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a waypoint_set_current message into a struct
- *
- * @param msg The message to decode
- * @param waypoint_set_current C-struct to decode the message contents into
- */
-static inline void mavlink_msg_waypoint_set_current_decode(const mavlink_message_t* msg, mavlink_waypoint_set_current_t* waypoint_set_current)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	waypoint_set_current->target_system = mavlink_msg_waypoint_set_current_get_target_system(msg);
-	waypoint_set_current->target_component = mavlink_msg_waypoint_set_current_get_target_component(msg);
-	waypoint_set_current->seq = mavlink_msg_waypoint_set_current_get_seq(msg);
-#else
-	memcpy(waypoint_set_current, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/common/testsuite.h b/mavlink/include/mavlink/v0.9/common/testsuite.h
deleted file mode 100644
index b3a94e96e..000000000
--- a/mavlink/include/mavlink/v0.9/common/testsuite.h
+++ /dev/null
@@ -1,3700 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from common.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef COMMON_TESTSUITE_H
-#define COMMON_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-
-	mavlink_test_common(system_id, component_id, last_msg);
-}
-#endif
-
-
-
-
-static void mavlink_test_heartbeat(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_heartbeat_t packet_in = {
-		5,
-	72,
-	2,
-	};
-	mavlink_heartbeat_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.autopilot = packet_in.autopilot;
-        	packet1.mavlink_version = packet_in.mavlink_version;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack(system_id, component_id, &msg , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_send(MAVLINK_COMM_1 , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_boot(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_boot_t packet_in = {
-		963497464,
-	};
-	mavlink_boot_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.version = packet_in.version;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_boot_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_boot_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_boot_pack(system_id, component_id, &msg , packet1.version );
-	mavlink_msg_boot_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_boot_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.version );
-	mavlink_msg_boot_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_boot_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_boot_send(MAVLINK_COMM_1 , packet1.version );
-	mavlink_msg_boot_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_system_time(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_system_time_t packet_in = {
-		93372036854775807ULL,
-	};
-	mavlink_system_time_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time_usec = packet_in.time_usec;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_system_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_pack(system_id, component_id, &msg , packet1.time_usec );
-	mavlink_msg_system_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_usec );
-	mavlink_msg_system_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_system_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_send(MAVLINK_COMM_1 , packet1.time_usec );
-	mavlink_msg_system_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ping(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ping_t packet_in = {
-		963497464,
-	17,
-	84,
-	93372036854776185ULL,
-	};
-	mavlink_ping_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.seq = packet_in.seq;
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.time = packet_in.time;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ping_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ping_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ping_pack(system_id, component_id, &msg , packet1.seq , packet1.target_system , packet1.target_component , packet1.time );
-	mavlink_msg_ping_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ping_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.seq , packet1.target_system , packet1.target_component , packet1.time );
-	mavlink_msg_ping_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ping_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ping_send(MAVLINK_COMM_1 , packet1.seq , packet1.target_system , packet1.target_component , packet1.time );
-	mavlink_msg_ping_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_system_time_utc(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_system_time_utc_t packet_in = {
-		963497464,
-	963497672,
-	};
-	mavlink_system_time_utc_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.utc_date = packet_in.utc_date;
-        	packet1.utc_time = packet_in.utc_time;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_utc_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_system_time_utc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_utc_pack(system_id, component_id, &msg , packet1.utc_date , packet1.utc_time );
-	mavlink_msg_system_time_utc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_utc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.utc_date , packet1.utc_time );
-	mavlink_msg_system_time_utc_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_system_time_utc_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_system_time_utc_send(MAVLINK_COMM_1 , packet1.utc_date , packet1.utc_time );
-	mavlink_msg_system_time_utc_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_change_operator_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_change_operator_control_t packet_in = {
-		5,
-	72,
-	139,
-	"DEFGHIJKLMNOPQRSTUVWXYZA",
-	};
-	mavlink_change_operator_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.control_request = packet_in.control_request;
-        	packet1.version = packet_in.version;
-        
-        	mav_array_memcpy(packet1.passkey, packet_in.passkey, sizeof(char)*25);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_change_operator_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_pack(system_id, component_id, &msg , packet1.target_system , packet1.control_request , packet1.version , packet1.passkey );
-	mavlink_msg_change_operator_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.control_request , packet1.version , packet1.passkey );
-	mavlink_msg_change_operator_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_change_operator_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_send(MAVLINK_COMM_1 , packet1.target_system , packet1.control_request , packet1.version , packet1.passkey );
-	mavlink_msg_change_operator_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_change_operator_control_ack(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_change_operator_control_ack_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_change_operator_control_ack_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.gcs_system_id = packet_in.gcs_system_id;
-        	packet1.control_request = packet_in.control_request;
-        	packet1.ack = packet_in.ack;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_ack_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_change_operator_control_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_ack_pack(system_id, component_id, &msg , packet1.gcs_system_id , packet1.control_request , packet1.ack );
-	mavlink_msg_change_operator_control_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_ack_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.gcs_system_id , packet1.control_request , packet1.ack );
-	mavlink_msg_change_operator_control_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_change_operator_control_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_change_operator_control_ack_send(MAVLINK_COMM_1 , packet1.gcs_system_id , packet1.control_request , packet1.ack );
-	mavlink_msg_change_operator_control_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_auth_key(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_auth_key_t packet_in = {
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZABCDE",
-	};
-	mavlink_auth_key_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        
-        	mav_array_memcpy(packet1.key, packet_in.key, sizeof(char)*32);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_auth_key_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_auth_key_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_auth_key_pack(system_id, component_id, &msg , packet1.key );
-	mavlink_msg_auth_key_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_auth_key_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.key );
-	mavlink_msg_auth_key_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_auth_key_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_auth_key_send(MAVLINK_COMM_1 , packet1.key );
-	mavlink_msg_auth_key_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_action_ack(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_action_ack_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_action_ack_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.action = packet_in.action;
-        	packet1.result = packet_in.result;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_ack_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_action_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_ack_pack(system_id, component_id, &msg , packet1.action , packet1.result );
-	mavlink_msg_action_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_ack_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.action , packet1.result );
-	mavlink_msg_action_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_action_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_ack_send(MAVLINK_COMM_1 , packet1.action , packet1.result );
-	mavlink_msg_action_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_action(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_action_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_action_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.action = packet_in.action;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_pack(system_id, component_id, &msg , packet1.target , packet1.target_component , packet1.action );
-	mavlink_msg_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.target_component , packet1.action );
-	mavlink_msg_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_action_send(MAVLINK_COMM_1 , packet1.target , packet1.target_component , packet1.action );
-	mavlink_msg_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_mode(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_mode_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_set_mode_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.mode = packet_in.mode;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mode_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mode_pack(system_id, component_id, &msg , packet1.target , packet1.mode );
-	mavlink_msg_set_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mode_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.mode );
-	mavlink_msg_set_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_mode_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_mode_send(MAVLINK_COMM_1 , packet1.target , packet1.mode );
-	mavlink_msg_set_mode_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_nav_mode(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_nav_mode_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_set_nav_mode_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.nav_mode = packet_in.nav_mode;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_nav_mode_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_nav_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_nav_mode_pack(system_id, component_id, &msg , packet1.target , packet1.nav_mode );
-	mavlink_msg_set_nav_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_nav_mode_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.nav_mode );
-	mavlink_msg_set_nav_mode_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_nav_mode_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_nav_mode_send(MAVLINK_COMM_1 , packet1.target , packet1.nav_mode );
-	mavlink_msg_set_nav_mode_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_param_request_read(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_param_request_read_t packet_in = {
-		5,
-	72,
-	{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153 },
-	18119,
-	};
-	mavlink_param_request_read_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.param_index = packet_in.param_index;
-        
-        	mav_array_memcpy(packet1.param_id, packet_in.param_id, sizeof(int8_t)*15);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_read_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_param_request_read_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_read_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_index );
-	mavlink_msg_param_request_read_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_read_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_index );
-	mavlink_msg_param_request_read_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_param_request_read_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_read_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_index );
-	mavlink_msg_param_request_read_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_param_request_list(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_param_request_list_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_param_request_list_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_list_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_param_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_list_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_param_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_list_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_param_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_param_request_list_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_request_list_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component );
-	mavlink_msg_param_request_list_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_param_value(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_param_value_t packet_in = {
-		{ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 },
-	122.0,
-	18223,
-	18327,
-	};
-	mavlink_param_value_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.param_value = packet_in.param_value;
-        	packet1.param_count = packet_in.param_count;
-        	packet1.param_index = packet_in.param_index;
-        
-        	mav_array_memcpy(packet1.param_id, packet_in.param_id, sizeof(int8_t)*15);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_value_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_param_value_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_value_pack(system_id, component_id, &msg , packet1.param_id , packet1.param_value , packet1.param_count , packet1.param_index );
-	mavlink_msg_param_value_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_value_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.param_id , packet1.param_value , packet1.param_count , packet1.param_index );
-	mavlink_msg_param_value_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_param_value_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_value_send(MAVLINK_COMM_1 , packet1.param_id , packet1.param_value , packet1.param_count , packet1.param_index );
-	mavlink_msg_param_value_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_param_set(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_param_set_t packet_in = {
-		5,
-	72,
-	{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153 },
-	136.0,
-	};
-	mavlink_param_set_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.param_value = packet_in.param_value;
-        
-        	mav_array_memcpy(packet1.param_id, packet_in.param_id, sizeof(int8_t)*15);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_set_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_param_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_set_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_value );
-	mavlink_msg_param_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_set_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_value );
-	mavlink_msg_param_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_param_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_param_set_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.param_id , packet1.param_value );
-	mavlink_msg_param_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_raw_int(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_raw_int_t packet_in = {
-		93372036854775807ULL,
-	29,
-	963497932,
-	963498140,
-	963498348,
-	164.0,
-	192.0,
-	220.0,
-	248.0,
-	};
-	mavlink_gps_raw_int_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.fix_type = packet_in.fix_type;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.eph = packet_in.eph;
-        	packet1.epv = packet_in.epv;
-        	packet1.v = packet_in.v;
-        	packet1.hdg = packet_in.hdg;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_int_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_raw_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_int_pack(system_id, component_id, &msg , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_int_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_raw_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_int_send(MAVLINK_COMM_1 , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_scaled_imu(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_scaled_imu_t packet_in = {
-		93372036854775807ULL,
-	17651,
-	17755,
-	17859,
-	17963,
-	18067,
-	18171,
-	18275,
-	18379,
-	18483,
-	};
-	mavlink_scaled_imu_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.xacc = packet_in.xacc;
-        	packet1.yacc = packet_in.yacc;
-        	packet1.zacc = packet_in.zacc;
-        	packet1.xgyro = packet_in.xgyro;
-        	packet1.ygyro = packet_in.ygyro;
-        	packet1.zgyro = packet_in.zgyro;
-        	packet1.xmag = packet_in.xmag;
-        	packet1.ymag = packet_in.ymag;
-        	packet1.zmag = packet_in.zmag;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_imu_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_scaled_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_imu_pack(system_id, component_id, &msg , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_scaled_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_imu_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_scaled_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_scaled_imu_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_imu_send(MAVLINK_COMM_1 , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_scaled_imu_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_status_t packet_in = {
-		5,
-	{ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91 },
-	{ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151 },
-	{ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211 },
-	{ 252, 253, 254, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
-	{ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75 },
-	};
-	mavlink_gps_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.satellites_visible = packet_in.satellites_visible;
-        
-        	mav_array_memcpy(packet1.satellite_prn, packet_in.satellite_prn, sizeof(int8_t)*20);
-        	mav_array_memcpy(packet1.satellite_used, packet_in.satellite_used, sizeof(int8_t)*20);
-        	mav_array_memcpy(packet1.satellite_elevation, packet_in.satellite_elevation, sizeof(int8_t)*20);
-        	mav_array_memcpy(packet1.satellite_azimuth, packet_in.satellite_azimuth, sizeof(int8_t)*20);
-        	mav_array_memcpy(packet1.satellite_snr, packet_in.satellite_snr, sizeof(int8_t)*20);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_status_pack(system_id, component_id, &msg , packet1.satellites_visible , packet1.satellite_prn , packet1.satellite_used , packet1.satellite_elevation , packet1.satellite_azimuth , packet1.satellite_snr );
-	mavlink_msg_gps_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.satellites_visible , packet1.satellite_prn , packet1.satellite_used , packet1.satellite_elevation , packet1.satellite_azimuth , packet1.satellite_snr );
-	mavlink_msg_gps_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_status_send(MAVLINK_COMM_1 , packet1.satellites_visible , packet1.satellite_prn , packet1.satellite_used , packet1.satellite_elevation , packet1.satellite_azimuth , packet1.satellite_snr );
-	mavlink_msg_gps_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_raw_imu(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_raw_imu_t packet_in = {
-		93372036854775807ULL,
-	17651,
-	17755,
-	17859,
-	17963,
-	18067,
-	18171,
-	18275,
-	18379,
-	18483,
-	};
-	mavlink_raw_imu_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.xacc = packet_in.xacc;
-        	packet1.yacc = packet_in.yacc;
-        	packet1.zacc = packet_in.zacc;
-        	packet1.xgyro = packet_in.xgyro;
-        	packet1.ygyro = packet_in.ygyro;
-        	packet1.zgyro = packet_in.zgyro;
-        	packet1.xmag = packet_in.xmag;
-        	packet1.ymag = packet_in.ymag;
-        	packet1.zmag = packet_in.zmag;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_imu_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_raw_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_imu_pack(system_id, component_id, &msg , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_raw_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_imu_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_raw_imu_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_raw_imu_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_imu_send(MAVLINK_COMM_1 , packet1.usec , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.xmag , packet1.ymag , packet1.zmag );
-	mavlink_msg_raw_imu_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_raw_pressure(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_raw_pressure_t packet_in = {
-		93372036854775807ULL,
-	17651,
-	17755,
-	17859,
-	17963,
-	};
-	mavlink_raw_pressure_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.press_abs = packet_in.press_abs;
-        	packet1.press_diff1 = packet_in.press_diff1;
-        	packet1.press_diff2 = packet_in.press_diff2;
-        	packet1.temperature = packet_in.temperature;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_pressure_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_raw_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_pressure_pack(system_id, component_id, &msg , packet1.usec , packet1.press_abs , packet1.press_diff1 , packet1.press_diff2 , packet1.temperature );
-	mavlink_msg_raw_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_pressure_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.press_abs , packet1.press_diff1 , packet1.press_diff2 , packet1.temperature );
-	mavlink_msg_raw_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_raw_pressure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_pressure_send(MAVLINK_COMM_1 , packet1.usec , packet1.press_abs , packet1.press_diff1 , packet1.press_diff2 , packet1.temperature );
-	mavlink_msg_raw_pressure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_scaled_pressure(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_scaled_pressure_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	18067,
-	};
-	mavlink_scaled_pressure_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.press_abs = packet_in.press_abs;
-        	packet1.press_diff = packet_in.press_diff;
-        	packet1.temperature = packet_in.temperature;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_pressure_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_scaled_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_pressure_pack(system_id, component_id, &msg , packet1.usec , packet1.press_abs , packet1.press_diff , packet1.temperature );
-	mavlink_msg_scaled_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_pressure_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.press_abs , packet1.press_diff , packet1.temperature );
-	mavlink_msg_scaled_pressure_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_scaled_pressure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_scaled_pressure_send(MAVLINK_COMM_1 , packet1.usec , packet1.press_abs , packet1.press_diff , packet1.temperature );
-	mavlink_msg_scaled_pressure_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_attitude(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_attitude_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_attitude_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.rollspeed = packet_in.rollspeed;
-        	packet1.pitchspeed = packet_in.pitchspeed;
-        	packet1.yawspeed = packet_in.yawspeed;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_attitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_pack(system_id, component_id, &msg , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed );
-	mavlink_msg_attitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed );
-	mavlink_msg_attitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_attitude_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_send(MAVLINK_COMM_1 , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed );
-	mavlink_msg_attitude_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_local_position(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_local_position_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_local_position_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.vx = packet_in.vx;
-        	packet1.vy = packet_in.vy;
-        	packet1.vz = packet_in.vz;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_local_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_pack(system_id, component_id, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_local_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_local_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_local_position_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_send(MAVLINK_COMM_1 , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_local_position_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_global_position(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_global_position_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_global_position_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.vx = packet_in.vx;
-        	packet1.vy = packet_in.vy;
-        	packet1.vz = packet_in.vz;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_global_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_pack(system_id, component_id, &msg , packet1.usec , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_global_position_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_send(MAVLINK_COMM_1 , packet1.usec , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_raw(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_raw_t packet_in = {
-		93372036854775807ULL,
-	29,
-	80.0,
-	108.0,
-	136.0,
-	164.0,
-	192.0,
-	220.0,
-	248.0,
-	};
-	mavlink_gps_raw_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.fix_type = packet_in.fix_type;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.eph = packet_in.eph;
-        	packet1.epv = packet_in.epv;
-        	packet1.v = packet_in.v;
-        	packet1.hdg = packet_in.hdg;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_pack(system_id, component_id, &msg , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_raw_send(MAVLINK_COMM_1 , packet1.usec , packet1.fix_type , packet1.lat , packet1.lon , packet1.alt , packet1.eph , packet1.epv , packet1.v , packet1.hdg );
-	mavlink_msg_gps_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_sys_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_sys_status_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	17495,
-	17599,
-	17703,
-	};
-	mavlink_sys_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.mode = packet_in.mode;
-        	packet1.nav_mode = packet_in.nav_mode;
-        	packet1.status = packet_in.status;
-        	packet1.load = packet_in.load;
-        	packet1.vbat = packet_in.vbat;
-        	packet1.battery_remaining = packet_in.battery_remaining;
-        	packet1.packet_drop = packet_in.packet_drop;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sys_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sys_status_pack(system_id, component_id, &msg , packet1.mode , packet1.nav_mode , packet1.status , packet1.load , packet1.vbat , packet1.battery_remaining , packet1.packet_drop );
-	mavlink_msg_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sys_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.mode , packet1.nav_mode , packet1.status , packet1.load , packet1.vbat , packet1.battery_remaining , packet1.packet_drop );
-	mavlink_msg_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sys_status_send(MAVLINK_COMM_1 , packet1.mode , packet1.nav_mode , packet1.status , packet1.load , packet1.vbat , packet1.battery_remaining , packet1.packet_drop );
-	mavlink_msg_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_rc_channels_raw(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_rc_channels_raw_t packet_in = {
-		17235,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	17859,
-	17963,
-	53,
-	};
-	mavlink_rc_channels_raw_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.chan1_raw = packet_in.chan1_raw;
-        	packet1.chan2_raw = packet_in.chan2_raw;
-        	packet1.chan3_raw = packet_in.chan3_raw;
-        	packet1.chan4_raw = packet_in.chan4_raw;
-        	packet1.chan5_raw = packet_in.chan5_raw;
-        	packet1.chan6_raw = packet_in.chan6_raw;
-        	packet1.chan7_raw = packet_in.chan7_raw;
-        	packet1.chan8_raw = packet_in.chan8_raw;
-        	packet1.rssi = packet_in.rssi;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_raw_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_rc_channels_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_raw_pack(system_id, component_id, &msg , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw , packet1.rssi );
-	mavlink_msg_rc_channels_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_raw_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw , packet1.rssi );
-	mavlink_msg_rc_channels_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_rc_channels_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_raw_send(MAVLINK_COMM_1 , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw , packet1.rssi );
-	mavlink_msg_rc_channels_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_rc_channels_scaled(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_rc_channels_scaled_t packet_in = {
-		17235,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	17859,
-	17963,
-	53,
-	};
-	mavlink_rc_channels_scaled_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.chan1_scaled = packet_in.chan1_scaled;
-        	packet1.chan2_scaled = packet_in.chan2_scaled;
-        	packet1.chan3_scaled = packet_in.chan3_scaled;
-        	packet1.chan4_scaled = packet_in.chan4_scaled;
-        	packet1.chan5_scaled = packet_in.chan5_scaled;
-        	packet1.chan6_scaled = packet_in.chan6_scaled;
-        	packet1.chan7_scaled = packet_in.chan7_scaled;
-        	packet1.chan8_scaled = packet_in.chan8_scaled;
-        	packet1.rssi = packet_in.rssi;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_scaled_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_rc_channels_scaled_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_scaled_pack(system_id, component_id, &msg , packet1.chan1_scaled , packet1.chan2_scaled , packet1.chan3_scaled , packet1.chan4_scaled , packet1.chan5_scaled , packet1.chan6_scaled , packet1.chan7_scaled , packet1.chan8_scaled , packet1.rssi );
-	mavlink_msg_rc_channels_scaled_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_scaled_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.chan1_scaled , packet1.chan2_scaled , packet1.chan3_scaled , packet1.chan4_scaled , packet1.chan5_scaled , packet1.chan6_scaled , packet1.chan7_scaled , packet1.chan8_scaled , packet1.rssi );
-	mavlink_msg_rc_channels_scaled_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_rc_channels_scaled_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_scaled_send(MAVLINK_COMM_1 , packet1.chan1_scaled , packet1.chan2_scaled , packet1.chan3_scaled , packet1.chan4_scaled , packet1.chan5_scaled , packet1.chan6_scaled , packet1.chan7_scaled , packet1.chan8_scaled , packet1.rssi );
-	mavlink_msg_rc_channels_scaled_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_servo_output_raw(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_servo_output_raw_t packet_in = {
-		17235,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	17859,
-	17963,
-	};
-	mavlink_servo_output_raw_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.servo1_raw = packet_in.servo1_raw;
-        	packet1.servo2_raw = packet_in.servo2_raw;
-        	packet1.servo3_raw = packet_in.servo3_raw;
-        	packet1.servo4_raw = packet_in.servo4_raw;
-        	packet1.servo5_raw = packet_in.servo5_raw;
-        	packet1.servo6_raw = packet_in.servo6_raw;
-        	packet1.servo7_raw = packet_in.servo7_raw;
-        	packet1.servo8_raw = packet_in.servo8_raw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_servo_output_raw_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_servo_output_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_servo_output_raw_pack(system_id, component_id, &msg , packet1.servo1_raw , packet1.servo2_raw , packet1.servo3_raw , packet1.servo4_raw , packet1.servo5_raw , packet1.servo6_raw , packet1.servo7_raw , packet1.servo8_raw );
-	mavlink_msg_servo_output_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_servo_output_raw_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.servo1_raw , packet1.servo2_raw , packet1.servo3_raw , packet1.servo4_raw , packet1.servo5_raw , packet1.servo6_raw , packet1.servo7_raw , packet1.servo8_raw );
-	mavlink_msg_servo_output_raw_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_servo_output_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_servo_output_raw_send(MAVLINK_COMM_1 , packet1.servo1_raw , packet1.servo2_raw , packet1.servo3_raw , packet1.servo4_raw , packet1.servo5_raw , packet1.servo6_raw , packet1.servo7_raw , packet1.servo8_raw );
-	mavlink_msg_servo_output_raw_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_t packet_in = {
-		5,
-	72,
-	17339,
-	17,
-	84,
-	151,
-	218,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	241.0,
-	};
-	mavlink_waypoint_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.seq = packet_in.seq;
-        	packet1.frame = packet_in.frame;
-        	packet1.command = packet_in.command;
-        	packet1.current = packet_in.current;
-        	packet1.autocontinue = packet_in.autocontinue;
-        	packet1.param1 = packet_in.param1;
-        	packet1.param2 = packet_in.param2;
-        	packet1.param3 = packet_in.param3;
-        	packet1.param4 = packet_in.param4;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.seq , packet1.frame , packet1.command , packet1.current , packet1.autocontinue , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_waypoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.seq , packet1.frame , packet1.command , packet1.current , packet1.autocontinue , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_waypoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.seq , packet1.frame , packet1.command , packet1.current , packet1.autocontinue , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_waypoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_request(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_request_t packet_in = {
-		5,
-	72,
-	17339,
-	};
-	mavlink_waypoint_request_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.seq = packet_in.seq;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_request_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_request_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_request_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_request_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_request_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_set_current(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_set_current_t packet_in = {
-		5,
-	72,
-	17339,
-	};
-	mavlink_waypoint_set_current_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.seq = packet_in.seq;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_set_current_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_set_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_set_current_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_set_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_set_current_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_set_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_set_current_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_set_current_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.seq );
-	mavlink_msg_waypoint_set_current_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_current(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_current_t packet_in = {
-		17235,
-	};
-	mavlink_waypoint_current_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.seq = packet_in.seq;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_current_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_current_pack(system_id, component_id, &msg , packet1.seq );
-	mavlink_msg_waypoint_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_current_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.seq );
-	mavlink_msg_waypoint_current_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_current_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_current_send(MAVLINK_COMM_1 , packet1.seq );
-	mavlink_msg_waypoint_current_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_request_list(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_request_list_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_waypoint_request_list_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_list_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_list_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_list_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_request_list_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_request_list_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_request_list_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_request_list_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_count(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_count_t packet_in = {
-		5,
-	72,
-	17339,
-	};
-	mavlink_waypoint_count_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.count = packet_in.count;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_count_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_count_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_count_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.count );
-	mavlink_msg_waypoint_count_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_count_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.count );
-	mavlink_msg_waypoint_count_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_count_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_count_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.count );
-	mavlink_msg_waypoint_count_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_clear_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_clear_all_t packet_in = {
-		5,
-	72,
-	};
-	mavlink_waypoint_clear_all_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_clear_all_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_clear_all_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_clear_all_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_clear_all_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_clear_all_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_clear_all_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_clear_all_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_clear_all_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component );
-	mavlink_msg_waypoint_clear_all_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_reached(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_reached_t packet_in = {
-		17235,
-	};
-	mavlink_waypoint_reached_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.seq = packet_in.seq;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_reached_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_reached_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_reached_pack(system_id, component_id, &msg , packet1.seq );
-	mavlink_msg_waypoint_reached_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_reached_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.seq );
-	mavlink_msg_waypoint_reached_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_reached_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_reached_send(MAVLINK_COMM_1 , packet1.seq );
-	mavlink_msg_waypoint_reached_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_waypoint_ack(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_waypoint_ack_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_waypoint_ack_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.type = packet_in.type;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_ack_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_waypoint_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_ack_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.type );
-	mavlink_msg_waypoint_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_ack_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.type );
-	mavlink_msg_waypoint_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_waypoint_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_waypoint_ack_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.type );
-	mavlink_msg_waypoint_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_set_global_origin(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_set_global_origin_t packet_in = {
-		5,
-	72,
-	963497568,
-	963497776,
-	963497984,
-	};
-	mavlink_gps_set_global_origin_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.latitude = packet_in.latitude;
-        	packet1.longitude = packet_in.longitude;
-        	packet1.altitude = packet_in.altitude;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_set_global_origin_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_set_global_origin_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_set_global_origin_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_set_global_origin_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_set_global_origin_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_set_global_origin_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_set_global_origin_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_set_global_origin_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_set_global_origin_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_local_origin_set(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_local_origin_set_t packet_in = {
-		963497464,
-	963497672,
-	963497880,
-	};
-	mavlink_gps_local_origin_set_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.latitude = packet_in.latitude;
-        	packet1.longitude = packet_in.longitude;
-        	packet1.altitude = packet_in.altitude;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_local_origin_set_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_local_origin_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_local_origin_set_pack(system_id, component_id, &msg , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_local_origin_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_local_origin_set_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_local_origin_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_local_origin_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_local_origin_set_send(MAVLINK_COMM_1 , packet1.latitude , packet1.longitude , packet1.altitude );
-	mavlink_msg_gps_local_origin_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_local_position_setpoint_set(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_local_position_setpoint_set_t packet_in = {
-		5,
-	72,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	};
-	mavlink_local_position_setpoint_set_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_set_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_local_position_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_set_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_set_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_local_position_setpoint_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_set_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_local_position_setpoint(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_local_position_setpoint_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	};
-	mavlink_local_position_setpoint_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_local_position_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_pack(system_id, component_id, &msg , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_local_position_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_local_position_setpoint_send(MAVLINK_COMM_1 , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_local_position_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_control_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_control_status_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	84,
-	151,
-	218,
-	};
-	mavlink_control_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.position_fix = packet_in.position_fix;
-        	packet1.vision_fix = packet_in.vision_fix;
-        	packet1.gps_fix = packet_in.gps_fix;
-        	packet1.ahrs_health = packet_in.ahrs_health;
-        	packet1.control_att = packet_in.control_att;
-        	packet1.control_pos_xy = packet_in.control_pos_xy;
-        	packet1.control_pos_z = packet_in.control_pos_z;
-        	packet1.control_pos_yaw = packet_in.control_pos_yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_control_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_control_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_control_status_pack(system_id, component_id, &msg , packet1.position_fix , packet1.vision_fix , packet1.gps_fix , packet1.ahrs_health , packet1.control_att , packet1.control_pos_xy , packet1.control_pos_z , packet1.control_pos_yaw );
-	mavlink_msg_control_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_control_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.position_fix , packet1.vision_fix , packet1.gps_fix , packet1.ahrs_health , packet1.control_att , packet1.control_pos_xy , packet1.control_pos_z , packet1.control_pos_yaw );
-	mavlink_msg_control_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_control_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_control_status_send(MAVLINK_COMM_1 , packet1.position_fix , packet1.vision_fix , packet1.gps_fix , packet1.ahrs_health , packet1.control_att , packet1.control_pos_xy , packet1.control_pos_z , packet1.control_pos_yaw );
-	mavlink_msg_control_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_safety_set_allowed_area(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_safety_set_allowed_area_t packet_in = {
-		5,
-	72,
-	139,
-	38.0,
-	66.0,
-	94.0,
-	122.0,
-	150.0,
-	178.0,
-	};
-	mavlink_safety_set_allowed_area_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.frame = packet_in.frame;
-        	packet1.p1x = packet_in.p1x;
-        	packet1.p1y = packet_in.p1y;
-        	packet1.p1z = packet_in.p1z;
-        	packet1.p2x = packet_in.p2x;
-        	packet1.p2y = packet_in.p2y;
-        	packet1.p2z = packet_in.p2z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_set_allowed_area_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_safety_set_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_set_allowed_area_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_set_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_set_allowed_area_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_set_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_safety_set_allowed_area_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_set_allowed_area_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_set_allowed_area_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_safety_allowed_area(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_safety_allowed_area_t packet_in = {
-		5,
-	24.0,
-	52.0,
-	80.0,
-	108.0,
-	136.0,
-	164.0,
-	};
-	mavlink_safety_allowed_area_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.frame = packet_in.frame;
-        	packet1.p1x = packet_in.p1x;
-        	packet1.p1y = packet_in.p1y;
-        	packet1.p1z = packet_in.p1z;
-        	packet1.p2x = packet_in.p2x;
-        	packet1.p2y = packet_in.p2y;
-        	packet1.p2z = packet_in.p2z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_allowed_area_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_safety_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_allowed_area_pack(system_id, component_id, &msg , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_allowed_area_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_allowed_area_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_safety_allowed_area_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_safety_allowed_area_send(MAVLINK_COMM_1 , packet1.frame , packet1.p1x , packet1.p1y , packet1.p1z , packet1.p2x , packet1.p2y , packet1.p2z );
-	mavlink_msg_safety_allowed_area_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_roll_pitch_yaw_thrust(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_roll_pitch_yaw_thrust_t packet_in = {
-		5,
-	72,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	};
-	mavlink_set_roll_pitch_yaw_thrust_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.thrust = packet_in.thrust;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_thrust_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_roll_pitch_yaw_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_thrust_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_thrust_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_roll_pitch_yaw_thrust_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_thrust_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_thrust_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_roll_pitch_yaw_speed_thrust(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_roll_pitch_yaw_speed_thrust_t packet_in = {
-		5,
-	72,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	};
-	mavlink_set_roll_pitch_yaw_speed_thrust_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.roll_speed = packet_in.roll_speed;
-        	packet1.pitch_speed = packet_in.pitch_speed;
-        	packet1.yaw_speed = packet_in.yaw_speed;
-        	packet1.thrust = packet_in.thrust;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_set_roll_pitch_yaw_speed_thrust_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_roll_pitch_yaw_thrust_setpoint(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_roll_pitch_yaw_thrust_setpoint_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_roll_pitch_yaw_thrust_setpoint_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time_us = packet_in.time_us;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.thrust = packet_in.thrust;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_pack(system_id, component_id, &msg , packet1.time_us , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_us , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_send(MAVLINK_COMM_1 , packet1.time_us , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_thrust_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_roll_pitch_yaw_speed_thrust_setpoint(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_roll_pitch_yaw_speed_thrust_setpoint_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_roll_pitch_yaw_speed_thrust_setpoint_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time_us = packet_in.time_us;
-        	packet1.roll_speed = packet_in.roll_speed;
-        	packet1.pitch_speed = packet_in.pitch_speed;
-        	packet1.yaw_speed = packet_in.yaw_speed;
-        	packet1.thrust = packet_in.thrust;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_pack(system_id, component_id, &msg , packet1.time_us , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_us , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_send(MAVLINK_COMM_1 , packet1.time_us , packet1.roll_speed , packet1.pitch_speed , packet1.yaw_speed , packet1.thrust );
-	mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_nav_controller_output(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_nav_controller_output_t packet_in = {
-		17.0,
-	45.0,
-	17651,
-	17755,
-	17859,
-	115.0,
-	143.0,
-	171.0,
-	};
-	mavlink_nav_controller_output_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.nav_roll = packet_in.nav_roll;
-        	packet1.nav_pitch = packet_in.nav_pitch;
-        	packet1.nav_bearing = packet_in.nav_bearing;
-        	packet1.target_bearing = packet_in.target_bearing;
-        	packet1.wp_dist = packet_in.wp_dist;
-        	packet1.alt_error = packet_in.alt_error;
-        	packet1.aspd_error = packet_in.aspd_error;
-        	packet1.xtrack_error = packet_in.xtrack_error;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_controller_output_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_nav_controller_output_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_controller_output_pack(system_id, component_id, &msg , packet1.nav_roll , packet1.nav_pitch , packet1.nav_bearing , packet1.target_bearing , packet1.wp_dist , packet1.alt_error , packet1.aspd_error , packet1.xtrack_error );
-	mavlink_msg_nav_controller_output_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_controller_output_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.nav_roll , packet1.nav_pitch , packet1.nav_bearing , packet1.target_bearing , packet1.wp_dist , packet1.alt_error , packet1.aspd_error , packet1.xtrack_error );
-	mavlink_msg_nav_controller_output_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_nav_controller_output_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_controller_output_send(MAVLINK_COMM_1 , packet1.nav_roll , packet1.nav_pitch , packet1.nav_bearing , packet1.target_bearing , packet1.wp_dist , packet1.alt_error , packet1.aspd_error , packet1.xtrack_error );
-	mavlink_msg_nav_controller_output_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_position_target(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_position_target_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	};
-	mavlink_position_target_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_target_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_position_target_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_target_pack(system_id, component_id, &msg , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_target_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_target_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_target_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_position_target_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_target_send(MAVLINK_COMM_1 , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_target_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_state_correction(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_state_correction_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	241.0,
-	};
-	mavlink_state_correction_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.xErr = packet_in.xErr;
-        	packet1.yErr = packet_in.yErr;
-        	packet1.zErr = packet_in.zErr;
-        	packet1.rollErr = packet_in.rollErr;
-        	packet1.pitchErr = packet_in.pitchErr;
-        	packet1.yawErr = packet_in.yawErr;
-        	packet1.vxErr = packet_in.vxErr;
-        	packet1.vyErr = packet_in.vyErr;
-        	packet1.vzErr = packet_in.vzErr;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_state_correction_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_state_correction_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_state_correction_pack(system_id, component_id, &msg , packet1.xErr , packet1.yErr , packet1.zErr , packet1.rollErr , packet1.pitchErr , packet1.yawErr , packet1.vxErr , packet1.vyErr , packet1.vzErr );
-	mavlink_msg_state_correction_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_state_correction_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.xErr , packet1.yErr , packet1.zErr , packet1.rollErr , packet1.pitchErr , packet1.yawErr , packet1.vxErr , packet1.vyErr , packet1.vzErr );
-	mavlink_msg_state_correction_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_state_correction_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_state_correction_send(MAVLINK_COMM_1 , packet1.xErr , packet1.yErr , packet1.zErr , packet1.rollErr , packet1.pitchErr , packet1.yawErr , packet1.vxErr , packet1.vyErr , packet1.vzErr );
-	mavlink_msg_state_correction_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_set_altitude(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_altitude_t packet_in = {
-		5,
-	963497516,
-	};
-	mavlink_set_altitude_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.mode = packet_in.mode;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_altitude_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_altitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_altitude_pack(system_id, component_id, &msg , packet1.target , packet1.mode );
-	mavlink_msg_set_altitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_altitude_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.mode );
-	mavlink_msg_set_altitude_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_altitude_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_altitude_send(MAVLINK_COMM_1 , packet1.target , packet1.mode );
-	mavlink_msg_set_altitude_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_request_data_stream(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_request_data_stream_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	84,
-	};
-	mavlink_request_data_stream_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.req_stream_id = packet_in.req_stream_id;
-        	packet1.req_message_rate = packet_in.req_message_rate;
-        	packet1.start_stop = packet_in.start_stop;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_request_data_stream_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_request_data_stream_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_request_data_stream_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.req_stream_id , packet1.req_message_rate , packet1.start_stop );
-	mavlink_msg_request_data_stream_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_request_data_stream_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.req_stream_id , packet1.req_message_rate , packet1.start_stop );
-	mavlink_msg_request_data_stream_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_request_data_stream_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_request_data_stream_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.req_stream_id , packet1.req_message_rate , packet1.start_stop );
-	mavlink_msg_request_data_stream_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_hil_state(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_hil_state_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	963499128,
-	963499336,
-	963499544,
-	19523,
-	19627,
-	19731,
-	19835,
-	19939,
-	20043,
-	};
-	mavlink_hil_state_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.rollspeed = packet_in.rollspeed;
-        	packet1.pitchspeed = packet_in.pitchspeed;
-        	packet1.yawspeed = packet_in.yawspeed;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.vx = packet_in.vx;
-        	packet1.vy = packet_in.vy;
-        	packet1.vz = packet_in.vz;
-        	packet1.xacc = packet_in.xacc;
-        	packet1.yacc = packet_in.yacc;
-        	packet1.zacc = packet_in.zacc;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_state_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_hil_state_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_state_pack(system_id, component_id, &msg , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz , packet1.xacc , packet1.yacc , packet1.zacc );
-	mavlink_msg_hil_state_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_state_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz , packet1.xacc , packet1.yacc , packet1.zacc );
-	mavlink_msg_hil_state_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_hil_state_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_state_send(MAVLINK_COMM_1 , packet1.usec , packet1.roll , packet1.pitch , packet1.yaw , packet1.rollspeed , packet1.pitchspeed , packet1.yawspeed , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz , packet1.xacc , packet1.yacc , packet1.zacc );
-	mavlink_msg_hil_state_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_hil_controls(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_hil_controls_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	77,
-	144,
-	};
-	mavlink_hil_controls_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time_us = packet_in.time_us;
-        	packet1.roll_ailerons = packet_in.roll_ailerons;
-        	packet1.pitch_elevator = packet_in.pitch_elevator;
-        	packet1.yaw_rudder = packet_in.yaw_rudder;
-        	packet1.throttle = packet_in.throttle;
-        	packet1.mode = packet_in.mode;
-        	packet1.nav_mode = packet_in.nav_mode;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_controls_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_hil_controls_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_controls_pack(system_id, component_id, &msg , packet1.time_us , packet1.roll_ailerons , packet1.pitch_elevator , packet1.yaw_rudder , packet1.throttle , packet1.mode , packet1.nav_mode );
-	mavlink_msg_hil_controls_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_controls_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_us , packet1.roll_ailerons , packet1.pitch_elevator , packet1.yaw_rudder , packet1.throttle , packet1.mode , packet1.nav_mode );
-	mavlink_msg_hil_controls_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_hil_controls_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_hil_controls_send(MAVLINK_COMM_1 , packet1.time_us , packet1.roll_ailerons , packet1.pitch_elevator , packet1.yaw_rudder , packet1.throttle , packet1.mode , packet1.nav_mode );
-	mavlink_msg_hil_controls_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_manual_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_manual_control_t packet_in = {
-		5,
-	24.0,
-	52.0,
-	80.0,
-	108.0,
-	120,
-	187,
-	254,
-	65,
-	};
-	mavlink_manual_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.thrust = packet_in.thrust;
-        	packet1.roll_manual = packet_in.roll_manual;
-        	packet1.pitch_manual = packet_in.pitch_manual;
-        	packet1.yaw_manual = packet_in.yaw_manual;
-        	packet1.thrust_manual = packet_in.thrust_manual;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_manual_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_manual_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_manual_control_pack(system_id, component_id, &msg , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_manual_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_manual_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_manual_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_manual_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_manual_control_send(MAVLINK_COMM_1 , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_manual_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_rc_channels_override(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_rc_channels_override_t packet_in = {
-		5,
-	72,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	17859,
-	17963,
-	18067,
-	};
-	mavlink_rc_channels_override_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.chan1_raw = packet_in.chan1_raw;
-        	packet1.chan2_raw = packet_in.chan2_raw;
-        	packet1.chan3_raw = packet_in.chan3_raw;
-        	packet1.chan4_raw = packet_in.chan4_raw;
-        	packet1.chan5_raw = packet_in.chan5_raw;
-        	packet1.chan6_raw = packet_in.chan6_raw;
-        	packet1.chan7_raw = packet_in.chan7_raw;
-        	packet1.chan8_raw = packet_in.chan8_raw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_override_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_rc_channels_override_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_override_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw );
-	mavlink_msg_rc_channels_override_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_override_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw );
-	mavlink_msg_rc_channels_override_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_rc_channels_override_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_rc_channels_override_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.chan1_raw , packet1.chan2_raw , packet1.chan3_raw , packet1.chan4_raw , packet1.chan5_raw , packet1.chan6_raw , packet1.chan7_raw , packet1.chan8_raw );
-	mavlink_msg_rc_channels_override_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_global_position_int(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_global_position_int_t packet_in = {
-		963497464,
-	963497672,
-	963497880,
-	17859,
-	17963,
-	18067,
-	};
-	mavlink_global_position_int_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.vx = packet_in.vx;
-        	packet1.vy = packet_in.vy;
-        	packet1.vz = packet_in.vz;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_int_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_global_position_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_int_pack(system_id, component_id, &msg , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_int_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_global_position_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_global_position_int_send(MAVLINK_COMM_1 , packet1.lat , packet1.lon , packet1.alt , packet1.vx , packet1.vy , packet1.vz );
-	mavlink_msg_global_position_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_vfr_hud(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_vfr_hud_t packet_in = {
-		17.0,
-	45.0,
-	17651,
-	17755,
-	101.0,
-	129.0,
-	};
-	mavlink_vfr_hud_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.airspeed = packet_in.airspeed;
-        	packet1.groundspeed = packet_in.groundspeed;
-        	packet1.heading = packet_in.heading;
-        	packet1.throttle = packet_in.throttle;
-        	packet1.alt = packet_in.alt;
-        	packet1.climb = packet_in.climb;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vfr_hud_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_vfr_hud_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vfr_hud_pack(system_id, component_id, &msg , packet1.airspeed , packet1.groundspeed , packet1.heading , packet1.throttle , packet1.alt , packet1.climb );
-	mavlink_msg_vfr_hud_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vfr_hud_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.airspeed , packet1.groundspeed , packet1.heading , packet1.throttle , packet1.alt , packet1.climb );
-	mavlink_msg_vfr_hud_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_vfr_hud_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vfr_hud_send(MAVLINK_COMM_1 , packet1.airspeed , packet1.groundspeed , packet1.heading , packet1.throttle , packet1.alt , packet1.climb );
-	mavlink_msg_vfr_hud_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_command(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_command_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	};
-	mavlink_command_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.command = packet_in.command;
-        	packet1.confirmation = packet_in.confirmation;
-        	packet1.param1 = packet_in.param1;
-        	packet1.param2 = packet_in.param2;
-        	packet1.param3 = packet_in.param3;
-        	packet1.param4 = packet_in.param4;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.command , packet1.confirmation , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 );
-	mavlink_msg_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.command , packet1.confirmation , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 );
-	mavlink_msg_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_command_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.command , packet1.confirmation , packet1.param1 , packet1.param2 , packet1.param3 , packet1.param4 );
-	mavlink_msg_command_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_command_ack(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_command_ack_t packet_in = {
-		17.0,
-	45.0,
-	};
-	mavlink_command_ack_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.command = packet_in.command;
-        	packet1.result = packet_in.result;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_ack_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_command_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_ack_pack(system_id, component_id, &msg , packet1.command , packet1.result );
-	mavlink_msg_command_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_ack_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.command , packet1.result );
-	mavlink_msg_command_ack_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_command_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_command_ack_send(MAVLINK_COMM_1 , packet1.command , packet1.result );
-	mavlink_msg_command_ack_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_optical_flow(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_optical_flow_t packet_in = {
-		93372036854775807ULL,
-	29,
-	17703,
-	17807,
-	108,
-	115.0,
-	};
-	mavlink_optical_flow_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time = packet_in.time;
-        	packet1.sensor_id = packet_in.sensor_id;
-        	packet1.flow_x = packet_in.flow_x;
-        	packet1.flow_y = packet_in.flow_y;
-        	packet1.quality = packet_in.quality;
-        	packet1.ground_distance = packet_in.ground_distance;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_optical_flow_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_optical_flow_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_optical_flow_pack(system_id, component_id, &msg , packet1.time , packet1.sensor_id , packet1.flow_x , packet1.flow_y , packet1.quality , packet1.ground_distance );
-	mavlink_msg_optical_flow_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_optical_flow_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time , packet1.sensor_id , packet1.flow_x , packet1.flow_y , packet1.quality , packet1.ground_distance );
-	mavlink_msg_optical_flow_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_optical_flow_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_optical_flow_send(MAVLINK_COMM_1 , packet1.time , packet1.sensor_id , packet1.flow_x , packet1.flow_y , packet1.quality , packet1.ground_distance );
-	mavlink_msg_optical_flow_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_object_detection_event(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_object_detection_event_t packet_in = {
-		963497464,
-	17443,
-	151,
-	"HIJKLMNOPQRSTUVWXYZ",
-	22,
-	213.0,
-	241.0,
-	};
-	mavlink_object_detection_event_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.time = packet_in.time;
-        	packet1.object_id = packet_in.object_id;
-        	packet1.type = packet_in.type;
-        	packet1.quality = packet_in.quality;
-        	packet1.bearing = packet_in.bearing;
-        	packet1.distance = packet_in.distance;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*20);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_object_detection_event_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_object_detection_event_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_object_detection_event_pack(system_id, component_id, &msg , packet1.time , packet1.object_id , packet1.type , packet1.name , packet1.quality , packet1.bearing , packet1.distance );
-	mavlink_msg_object_detection_event_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_object_detection_event_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time , packet1.object_id , packet1.type , packet1.name , packet1.quality , packet1.bearing , packet1.distance );
-	mavlink_msg_object_detection_event_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_object_detection_event_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_object_detection_event_send(MAVLINK_COMM_1 , packet1.time , packet1.object_id , packet1.type , packet1.name , packet1.quality , packet1.bearing , packet1.distance );
-	mavlink_msg_object_detection_event_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_debug_vect(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_debug_vect_t packet_in = {
-		"ABCDEFGHI",
-	93372036854776437ULL,
-	143.0,
-	171.0,
-	199.0,
-	};
-	mavlink_debug_vect_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*10);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_vect_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_debug_vect_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_vect_pack(system_id, component_id, &msg , packet1.name , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_debug_vect_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_vect_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.name , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_debug_vect_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_debug_vect_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_vect_send(MAVLINK_COMM_1 , packet1.name , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_debug_vect_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_named_value_float(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_named_value_float_t packet_in = {
-		"ABCDEFGHI",
-	87.0,
-	};
-	mavlink_named_value_float_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.value = packet_in.value;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*10);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_float_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_named_value_float_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_float_pack(system_id, component_id, &msg , packet1.name , packet1.value );
-	mavlink_msg_named_value_float_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_float_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.name , packet1.value );
-	mavlink_msg_named_value_float_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_named_value_float_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_float_send(MAVLINK_COMM_1 , packet1.name , packet1.value );
-	mavlink_msg_named_value_float_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_named_value_int(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_named_value_int_t packet_in = {
-		"ABCDEFGHI",
-	963497984,
-	};
-	mavlink_named_value_int_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.value = packet_in.value;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*10);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_int_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_named_value_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_int_pack(system_id, component_id, &msg , packet1.name , packet1.value );
-	mavlink_msg_named_value_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_int_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.name , packet1.value );
-	mavlink_msg_named_value_int_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_named_value_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_named_value_int_send(MAVLINK_COMM_1 , packet1.name , packet1.value );
-	mavlink_msg_named_value_int_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_statustext(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_statustext_t packet_in = {
-		5,
-	{ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121 },
-	};
-	mavlink_statustext_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.severity = packet_in.severity;
-        
-        	mav_array_memcpy(packet1.text, packet_in.text, sizeof(int8_t)*50);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_statustext_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_statustext_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_statustext_pack(system_id, component_id, &msg , packet1.severity , packet1.text );
-	mavlink_msg_statustext_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_statustext_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.severity , packet1.text );
-	mavlink_msg_statustext_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_statustext_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_statustext_send(MAVLINK_COMM_1 , packet1.severity , packet1.text );
-	mavlink_msg_statustext_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_debug(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_debug_t packet_in = {
-		5,
-	24.0,
-	};
-	mavlink_debug_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.ind = packet_in.ind;
-        	packet1.value = packet_in.value;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_debug_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_pack(system_id, component_id, &msg , packet1.ind , packet1.value );
-	mavlink_msg_debug_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.ind , packet1.value );
-	mavlink_msg_debug_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_debug_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_debug_send(MAVLINK_COMM_1 , packet1.ind , packet1.value );
-	mavlink_msg_debug_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_heartbeat(system_id, component_id, last_msg);
-	mavlink_test_boot(system_id, component_id, last_msg);
-	mavlink_test_system_time(system_id, component_id, last_msg);
-	mavlink_test_ping(system_id, component_id, last_msg);
-	mavlink_test_system_time_utc(system_id, component_id, last_msg);
-	mavlink_test_change_operator_control(system_id, component_id, last_msg);
-	mavlink_test_change_operator_control_ack(system_id, component_id, last_msg);
-	mavlink_test_auth_key(system_id, component_id, last_msg);
-	mavlink_test_action_ack(system_id, component_id, last_msg);
-	mavlink_test_action(system_id, component_id, last_msg);
-	mavlink_test_set_mode(system_id, component_id, last_msg);
-	mavlink_test_set_nav_mode(system_id, component_id, last_msg);
-	mavlink_test_param_request_read(system_id, component_id, last_msg);
-	mavlink_test_param_request_list(system_id, component_id, last_msg);
-	mavlink_test_param_value(system_id, component_id, last_msg);
-	mavlink_test_param_set(system_id, component_id, last_msg);
-	mavlink_test_gps_raw_int(system_id, component_id, last_msg);
-	mavlink_test_scaled_imu(system_id, component_id, last_msg);
-	mavlink_test_gps_status(system_id, component_id, last_msg);
-	mavlink_test_raw_imu(system_id, component_id, last_msg);
-	mavlink_test_raw_pressure(system_id, component_id, last_msg);
-	mavlink_test_scaled_pressure(system_id, component_id, last_msg);
-	mavlink_test_attitude(system_id, component_id, last_msg);
-	mavlink_test_local_position(system_id, component_id, last_msg);
-	mavlink_test_global_position(system_id, component_id, last_msg);
-	mavlink_test_gps_raw(system_id, component_id, last_msg);
-	mavlink_test_sys_status(system_id, component_id, last_msg);
-	mavlink_test_rc_channels_raw(system_id, component_id, last_msg);
-	mavlink_test_rc_channels_scaled(system_id, component_id, last_msg);
-	mavlink_test_servo_output_raw(system_id, component_id, last_msg);
-	mavlink_test_waypoint(system_id, component_id, last_msg);
-	mavlink_test_waypoint_request(system_id, component_id, last_msg);
-	mavlink_test_waypoint_set_current(system_id, component_id, last_msg);
-	mavlink_test_waypoint_current(system_id, component_id, last_msg);
-	mavlink_test_waypoint_request_list(system_id, component_id, last_msg);
-	mavlink_test_waypoint_count(system_id, component_id, last_msg);
-	mavlink_test_waypoint_clear_all(system_id, component_id, last_msg);
-	mavlink_test_waypoint_reached(system_id, component_id, last_msg);
-	mavlink_test_waypoint_ack(system_id, component_id, last_msg);
-	mavlink_test_gps_set_global_origin(system_id, component_id, last_msg);
-	mavlink_test_gps_local_origin_set(system_id, component_id, last_msg);
-	mavlink_test_local_position_setpoint_set(system_id, component_id, last_msg);
-	mavlink_test_local_position_setpoint(system_id, component_id, last_msg);
-	mavlink_test_control_status(system_id, component_id, last_msg);
-	mavlink_test_safety_set_allowed_area(system_id, component_id, last_msg);
-	mavlink_test_safety_allowed_area(system_id, component_id, last_msg);
-	mavlink_test_set_roll_pitch_yaw_thrust(system_id, component_id, last_msg);
-	mavlink_test_set_roll_pitch_yaw_speed_thrust(system_id, component_id, last_msg);
-	mavlink_test_roll_pitch_yaw_thrust_setpoint(system_id, component_id, last_msg);
-	mavlink_test_roll_pitch_yaw_speed_thrust_setpoint(system_id, component_id, last_msg);
-	mavlink_test_nav_controller_output(system_id, component_id, last_msg);
-	mavlink_test_position_target(system_id, component_id, last_msg);
-	mavlink_test_state_correction(system_id, component_id, last_msg);
-	mavlink_test_set_altitude(system_id, component_id, last_msg);
-	mavlink_test_request_data_stream(system_id, component_id, last_msg);
-	mavlink_test_hil_state(system_id, component_id, last_msg);
-	mavlink_test_hil_controls(system_id, component_id, last_msg);
-	mavlink_test_manual_control(system_id, component_id, last_msg);
-	mavlink_test_rc_channels_override(system_id, component_id, last_msg);
-	mavlink_test_global_position_int(system_id, component_id, last_msg);
-	mavlink_test_vfr_hud(system_id, component_id, last_msg);
-	mavlink_test_command(system_id, component_id, last_msg);
-	mavlink_test_command_ack(system_id, component_id, last_msg);
-	mavlink_test_optical_flow(system_id, component_id, last_msg);
-	mavlink_test_object_detection_event(system_id, component_id, last_msg);
-	mavlink_test_debug_vect(system_id, component_id, last_msg);
-	mavlink_test_named_value_float(system_id, component_id, last_msg);
-	mavlink_test_named_value_int(system_id, component_id, last_msg);
-	mavlink_test_statustext(system_id, component_id, last_msg);
-	mavlink_test_debug(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // COMMON_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/common/version.h b/mavlink/include/mavlink/v0.9/common/version.h
deleted file mode 100644
index 5ca3dc8ca..000000000
--- a/mavlink/include/mavlink/v0.9/common/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from common.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/mavlink_helpers.h b/mavlink/include/mavlink/v0.9/mavlink_helpers.h
deleted file mode 100644
index 98250e1ac..000000000
--- a/mavlink/include/mavlink/v0.9/mavlink_helpers.h
+++ /dev/null
@@ -1,488 +0,0 @@
-#ifndef  _MAVLINK_HELPERS_H_
-#define  _MAVLINK_HELPERS_H_
-
-#include "string.h"
-#include "checksum.h"
-#include "mavlink_types.h"
-
-#ifndef MAVLINK_HELPER
-#define MAVLINK_HELPER
-#endif
-
-/*
-  internal function to give access to the channel status for each channel
- */
-MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan)
-{
-	static mavlink_status_t m_mavlink_status[MAVLINK_COMM_NUM_BUFFERS];
-	return &m_mavlink_status[chan];
-}
-
-/**
- * @brief Finalize a MAVLink message with channel assignment
- *
- * This function calculates the checksum and sets length and aircraft id correctly.
- * It assumes that the message id and the payload are already correctly set. This function
- * can also be used if the message header has already been written before (as in mavlink_msg_xxx_pack
- * instead of mavlink_msg_xxx_pack_headerless), it just introduces little extra overhead.
- *
- * @param msg Message to finalize
- * @param system_id Id of the sending (this) system, 1-127
- * @param length Message length
- */
-#if MAVLINK_CRC_EXTRA
-MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						      uint8_t chan, uint8_t length, uint8_t crc_extra)
-#else
-MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						      uint8_t chan, uint8_t length)
-#endif
-{
-	// This code part is the same for all messages;
-	uint16_t checksum;
-	msg->magic = MAVLINK_STX;
-	msg->len = length;
-	msg->sysid = system_id;
-	msg->compid = component_id;
-	// One sequence number per component
-	msg->seq = mavlink_get_channel_status(chan)->current_tx_seq;
-	mavlink_get_channel_status(chan)->current_tx_seq = mavlink_get_channel_status(chan)->current_tx_seq+1;
-	checksum = crc_calculate((uint8_t*)&msg->len, length + MAVLINK_CORE_HEADER_LEN);
-#if MAVLINK_CRC_EXTRA
-	crc_accumulate(crc_extra, &checksum);
-#endif
-	mavlink_ck_a(msg) = (uint8_t)(checksum & 0xFF);
-	mavlink_ck_b(msg) = (uint8_t)(checksum >> 8);
-
-	return length + MAVLINK_NUM_NON_PAYLOAD_BYTES;
-}
-
-
-/**
- * @brief Finalize a MAVLink message with MAVLINK_COMM_0 as default channel
- */
-#if MAVLINK_CRC_EXTRA
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length, uint8_t crc_extra)
-{
-	return mavlink_finalize_message_chan(msg, system_id, component_id, MAVLINK_COMM_0, length, crc_extra);
-}
-#else
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length)
-{
-	return mavlink_finalize_message_chan(msg, system_id, component_id, MAVLINK_COMM_0, length);
-}
-#endif
-
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len);
-
-/**
- * @brief Finalize a MAVLink message with channel assignment and send
- */
-#if MAVLINK_CRC_EXTRA
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, 
-						    uint8_t length, uint8_t crc_extra)
-#else
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, uint8_t length)
-#endif
-{
-	uint16_t checksum;
-	uint8_t buf[MAVLINK_NUM_HEADER_BYTES];
-	uint8_t ck[2];
-	mavlink_status_t *status = mavlink_get_channel_status(chan);
-	buf[0] = MAVLINK_STX;
-	buf[1] = length;
-	buf[2] = status->current_tx_seq;
-	buf[3] = mavlink_system.sysid;
-	buf[4] = mavlink_system.compid;
-	buf[5] = msgid;
-	status->current_tx_seq++;
-	checksum = crc_calculate((uint8_t*)&buf[1], MAVLINK_CORE_HEADER_LEN);
-	crc_accumulate_buffer(&checksum, packet, length);
-#if MAVLINK_CRC_EXTRA
-	crc_accumulate(crc_extra, &checksum);
-#endif
-	ck[0] = (uint8_t)(checksum & 0xFF);
-	ck[1] = (uint8_t)(checksum >> 8);
-
-	MAVLINK_START_UART_SEND(chan, MAVLINK_NUM_NON_PAYLOAD_BYTES + (uint16_t)length);
-	_mavlink_send_uart(chan, (const char *)buf, MAVLINK_NUM_HEADER_BYTES);
-	_mavlink_send_uart(chan, packet, length);
-	_mavlink_send_uart(chan, (const char *)ck, 2);
-	MAVLINK_END_UART_SEND(chan, MAVLINK_NUM_NON_PAYLOAD_BYTES + (uint16_t)length);
-}
-#endif // MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-/**
- * @brief Pack a message to send it over a serial byte stream
- */
-MAVLINK_HELPER uint16_t mavlink_msg_to_send_buffer(uint8_t *buffer, const mavlink_message_t *msg)
-{
-	memcpy(buffer, (uint8_t *)&msg->magic, MAVLINK_NUM_NON_PAYLOAD_BYTES + (uint16_t)msg->len);
-	return MAVLINK_NUM_NON_PAYLOAD_BYTES + (uint16_t)msg->len;
-}
-
-union __mavlink_bitfield {
-	uint8_t uint8;
-	int8_t int8;
-	uint16_t uint16;
-	int16_t int16;
-	uint32_t uint32;
-	int32_t int32;
-};
-
-
-MAVLINK_HELPER void mavlink_start_checksum(mavlink_message_t* msg)
-{
-	crc_init(&msg->checksum);
-}
-
-MAVLINK_HELPER void mavlink_update_checksum(mavlink_message_t* msg, uint8_t c)
-{
-	crc_accumulate(c, &msg->checksum);
-}
-
-/**
- * This is a convenience function which handles the complete MAVLink parsing.
- * the function will parse one byte at a time and return the complete packet once
- * it could be successfully decoded. Checksum and other failures will be silently
- * ignored.
- *
- * @param chan     ID of the current channel. This allows to parse different channels with this function.
- *                 a channel is not a physical message channel like a serial port, but a logic partition of
- *                 the communication streams in this case. COMM_NB is the limit for the number of channels
- *                 on MCU (e.g. ARM7), while COMM_NB_HIGH is the limit for the number of channels in Linux/Windows
- * @param c        The char to barse
- *
- * @param returnMsg NULL if no message could be decoded, the message data else
- * @return 0 if no message could be decoded, 1 else
- *
- * A typical use scenario of this function call is:
- *
- * @code
- * #include <inttypes.h> // For fixed-width uint8_t type
- *
- * mavlink_message_t msg;
- * int chan = 0;
- *
- *
- * while(serial.bytesAvailable > 0)
- * {
- *   uint8_t byte = serial.getNextByte();
- *   if (mavlink_parse_char(chan, byte, &msg))
- *     {
- *     printf("Received message with ID %d, sequence: %d from component %d of system %d", msg.msgid, msg.seq, msg.compid, msg.sysid);
- *     }
- * }
- *
- *
- * @endcode
- */
-MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_message_t* r_message, mavlink_status_t* r_mavlink_status)
-{
-	static mavlink_message_t m_mavlink_message[MAVLINK_COMM_NUM_BUFFERS];
-
-        /*
-	  default message crc function. You can override this per-system to
-	  put this data in a different memory segment
-	*/
-#if MAVLINK_CRC_EXTRA
-#ifndef MAVLINK_MESSAGE_CRC
-	static const uint8_t mavlink_message_crcs[256] = MAVLINK_MESSAGE_CRCS;
-#define MAVLINK_MESSAGE_CRC(msgid) mavlink_message_crcs[msgid]
-#endif
-#endif
-
-	mavlink_message_t* rxmsg = &m_mavlink_message[chan]; ///< The currently decoded message
-	mavlink_status_t* status = mavlink_get_channel_status(chan); ///< The current decode status
-	int bufferIndex = 0;
-
-	status->msg_received = 0;
-
-	switch (status->parse_state)
-	{
-	case MAVLINK_PARSE_STATE_UNINIT:
-	case MAVLINK_PARSE_STATE_IDLE:
-		if (c == MAVLINK_STX)
-		{
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_STX;
-			rxmsg->len = 0;
-			mavlink_start_checksum(rxmsg);
-		}
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_STX:
-			if (status->msg_received 
-			/* Support shorter buffers than the
-			 default maximum packet size */
-#if (MAVLINK_MAX_PAYLOAD_LEN < 255)
-				|| c > MAVLINK_MAX_PAYLOAD_LEN
-#endif
-				)
-		{
-			status->buffer_overrun++;
-			status->parse_error++;
-			status->msg_received = 0;
-			status->parse_state = MAVLINK_PARSE_STATE_IDLE;
-		}
-		else
-		{
-			// NOT counting STX, LENGTH, SEQ, SYSID, COMPID, MSGID, CRC1 and CRC2
-			rxmsg->len = c;
-			status->packet_idx = 0;
-			mavlink_update_checksum(rxmsg, c);
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_LENGTH;
-		}
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_LENGTH:
-		rxmsg->seq = c;
-		mavlink_update_checksum(rxmsg, c);
-		status->parse_state = MAVLINK_PARSE_STATE_GOT_SEQ;
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_SEQ:
-		rxmsg->sysid = c;
-		mavlink_update_checksum(rxmsg, c);
-		status->parse_state = MAVLINK_PARSE_STATE_GOT_SYSID;
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_SYSID:
-		rxmsg->compid = c;
-		mavlink_update_checksum(rxmsg, c);
-		status->parse_state = MAVLINK_PARSE_STATE_GOT_COMPID;
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_COMPID:
-		rxmsg->msgid = c;
-		mavlink_update_checksum(rxmsg, c);
-		if (rxmsg->len == 0)
-		{
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_PAYLOAD;
-		}
-		else
-		{
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_MSGID;
-		}
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_MSGID:
-		_MAV_PAYLOAD(rxmsg)[status->packet_idx++] = (char)c;
-		mavlink_update_checksum(rxmsg, c);
-		if (status->packet_idx == rxmsg->len)
-		{
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_PAYLOAD;
-		}
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_PAYLOAD:
-#if MAVLINK_CRC_EXTRA
-		mavlink_update_checksum(rxmsg, MAVLINK_MESSAGE_CRC(rxmsg->msgid));
-#endif
-		if (c != (rxmsg->checksum & 0xFF)) {
-			// Check first checksum byte
-			status->parse_error++;
-			status->msg_received = 0;
-			status->parse_state = MAVLINK_PARSE_STATE_IDLE;
-			if (c == MAVLINK_STX)
-			{
-				status->parse_state = MAVLINK_PARSE_STATE_GOT_STX;
-				rxmsg->len = 0;
-				mavlink_start_checksum(rxmsg);
-			}
-		}
-		else
-		{
-			status->parse_state = MAVLINK_PARSE_STATE_GOT_CRC1;
-		}
-		break;
-
-	case MAVLINK_PARSE_STATE_GOT_CRC1:
-		if (c != (rxmsg->checksum >> 8)) {
-			// Check second checksum byte
-			status->parse_error++;
-			status->msg_received = 0;
-			status->parse_state = MAVLINK_PARSE_STATE_IDLE;
-			if (c == MAVLINK_STX)
-			{
-				status->parse_state = MAVLINK_PARSE_STATE_GOT_STX;
-				rxmsg->len = 0;
-				mavlink_start_checksum(rxmsg);
-			}
-		}
-		else
-		{
-			// Successfully got message
-			status->msg_received = 1;
-			status->parse_state = MAVLINK_PARSE_STATE_IDLE;
-			memcpy(r_message, rxmsg, sizeof(mavlink_message_t));
-		}
-		break;
-	}
-
-	bufferIndex++;
-	// If a message has been sucessfully decoded, check index
-	if (status->msg_received == 1)
-	{
-		//while(status->current_seq != rxmsg->seq)
-		//{
-		//	status->packet_rx_drop_count++;
-		//               status->current_seq++;
-		//}
-		status->current_rx_seq = rxmsg->seq;
-		// Initial condition: If no packet has been received so far, drop count is undefined
-		if (status->packet_rx_success_count == 0) status->packet_rx_drop_count = 0;
-		// Count this packet as received
-		status->packet_rx_success_count++;
-	}
-
-	r_mavlink_status->current_rx_seq = status->current_rx_seq+1;
-	r_mavlink_status->packet_rx_success_count = status->packet_rx_success_count;
-	r_mavlink_status->packet_rx_drop_count = status->parse_error;
-	status->parse_error = 0;
-	return status->msg_received;
-}
-
-/**
- * @brief Put a bitfield of length 1-32 bit into the buffer
- *
- * @param b the value to add, will be encoded in the bitfield
- * @param bits number of bits to use to encode b, e.g. 1 for boolean, 2, 3, etc.
- * @param packet_index the position in the packet (the index of the first byte to use)
- * @param bit_index the position in the byte (the index of the first bit to use)
- * @param buffer packet buffer to write into
- * @return new position of the last used byte in the buffer
- */
-MAVLINK_HELPER uint8_t put_bitfield_n_by_index(int32_t b, uint8_t bits, uint8_t packet_index, uint8_t bit_index, uint8_t* r_bit_index, uint8_t* buffer)
-{
-	uint16_t bits_remain = bits;
-	// Transform number into network order
-	int32_t v;
-	uint8_t i_bit_index, i_byte_index, curr_bits_n;
-#if MAVLINK_NEED_BYTE_SWAP
-	union {
-		int32_t i;
-		uint8_t b[4];
-	} bin, bout;
-	bin.i = b;
-	bout.b[0] = bin.b[3];
-	bout.b[1] = bin.b[2];
-	bout.b[2] = bin.b[1];
-	bout.b[3] = bin.b[0];
-	v = bout.i;
-#else
-	v = b;
-#endif
-
-	// buffer in
-	// 01100000 01000000 00000000 11110001
-	// buffer out
-	// 11110001 00000000 01000000 01100000
-
-	// Existing partly filled byte (four free slots)
-	// 0111xxxx
-
-	// Mask n free bits
-	// 00001111 = 2^0 + 2^1 + 2^2 + 2^3 = 2^n - 1
-	// = ((uint32_t)(1 << n)) - 1; // = 2^n - 1
-
-	// Shift n bits into the right position
-	// out = in >> n;
-
-	// Mask and shift bytes
-	i_bit_index = bit_index;
-	i_byte_index = packet_index;
-	if (bit_index > 0)
-	{
-		// If bits were available at start, they were available
-		// in the byte before the current index
-		i_byte_index--;
-	}
-
-	// While bits have not been packed yet
-	while (bits_remain > 0)
-	{
-		// Bits still have to be packed
-		// there can be more than 8 bits, so
-		// we might have to pack them into more than one byte
-
-		// First pack everything we can into the current 'open' byte
-		//curr_bits_n = bits_remain << 3; // Equals  bits_remain mod 8
-		//FIXME
-		if (bits_remain <= (uint8_t)(8 - i_bit_index))
-		{
-			// Enough space
-			curr_bits_n = (uint8_t)bits_remain;
-		}
-		else
-		{
-			curr_bits_n = (8 - i_bit_index);
-		}
-		
-		// Pack these n bits into the current byte
-		// Mask out whatever was at that position with ones (xxx11111)
-		buffer[i_byte_index] &= (0xFF >> (8 - curr_bits_n));
-		// Put content to this position, by masking out the non-used part
-		buffer[i_byte_index] |= ((0x00 << curr_bits_n) & v);
-		
-		// Increment the bit index
-		i_bit_index += curr_bits_n;
-
-		// Now proceed to the next byte, if necessary
-		bits_remain -= curr_bits_n;
-		if (bits_remain > 0)
-		{
-			// Offer another 8 bits / one byte
-			i_byte_index++;
-			i_bit_index = 0;
-		}
-	}
-	
-	*r_bit_index = i_bit_index;
-	// If a partly filled byte is present, mark this as consumed
-	if (i_bit_index != 7) i_byte_index++;
-	return i_byte_index - packet_index;
-}
-
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-// To make MAVLink work on your MCU, define comm_send_ch() if you wish
-// to send 1 byte at a time, or MAVLINK_SEND_UART_BYTES() to send a
-// whole packet at a time
-
-/*
-
-#include "mavlink_types.h"
-
-void comm_send_ch(mavlink_channel_t chan, uint8_t ch)
-{
-    if (chan == MAVLINK_COMM_0)
-    {
-        uart0_transmit(ch);
-    }
-    if (chan == MAVLINK_COMM_1)
-    {
-    	uart1_transmit(ch);
-    }
-}
- */
-
-MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len)
-{
-#ifdef MAVLINK_SEND_UART_BYTES
-	/* this is the more efficient approach, if the platform
-	   defines it */
-	MAVLINK_SEND_UART_BYTES(chan, (uint8_t *)buf, len);
-#else
-	/* fallback to one byte at a time */
-	uint16_t i;
-	for (i = 0; i < len; i++) {
-		comm_send_ch(chan, (uint8_t)buf[i]);
-	}
-#endif
-}
-#endif // MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-#endif /* _MAVLINK_HELPERS_H_ */
diff --git a/mavlink/include/mavlink/v0.9/mavlink_types.h b/mavlink/include/mavlink/v0.9/mavlink_types.h
deleted file mode 100644
index 630cb84b7..000000000
--- a/mavlink/include/mavlink/v0.9/mavlink_types.h
+++ /dev/null
@@ -1,300 +0,0 @@
-#ifndef MAVLINK_TYPES_H_
-#define MAVLINK_TYPES_H_
-
-#include "inttypes.h"
-
-enum MAV_CLASS
-{
-    MAV_CLASS_GENERIC = 0,        ///< Generic autopilot, full support for everything
-    MAV_CLASS_PIXHAWK = 1,        ///< PIXHAWK autopilot, http://pixhawk.ethz.ch
-    MAV_CLASS_SLUGS = 2,          ///< SLUGS autopilot, http://slugsuav.soe.ucsc.edu
-    MAV_CLASS_ARDUPILOTMEGA = 3,  ///< ArduPilotMega / ArduCopter, http://diydrones.com
-    MAV_CLASS_OPENPILOT = 4,      ///< OpenPilot, http://openpilot.org
-    MAV_CLASS_GENERIC_MISSION_WAYPOINTS_ONLY = 5,  ///< Generic autopilot only supporting simple waypoints
-    MAV_CLASS_GENERIC_MISSION_NAVIGATION_ONLY = 6, ///< Generic autopilot supporting waypoints and other simple navigation commands
-    MAV_CLASS_GENERIC_MISSION_FULL = 7,            ///< Generic autopilot supporting the full mission command set
-    MAV_CLASS_NONE = 8,           ///< No valid autopilot
-    MAV_CLASS_NB                  ///< Number of autopilot classes
-};
-
-enum MAV_ACTION
-{
-    MAV_ACTION_HOLD = 0,
-    MAV_ACTION_MOTORS_START = 1,
-    MAV_ACTION_LAUNCH = 2,
-    MAV_ACTION_RETURN = 3,
-    MAV_ACTION_EMCY_LAND = 4,
-    MAV_ACTION_EMCY_KILL = 5,
-    MAV_ACTION_CONFIRM_KILL = 6,
-    MAV_ACTION_CONTINUE = 7,
-    MAV_ACTION_MOTORS_STOP = 8,
-    MAV_ACTION_HALT = 9,
-    MAV_ACTION_SHUTDOWN = 10,
-    MAV_ACTION_REBOOT = 11,
-    MAV_ACTION_SET_MANUAL = 12,
-    MAV_ACTION_SET_AUTO = 13,
-    MAV_ACTION_STORAGE_READ = 14,
-    MAV_ACTION_STORAGE_WRITE = 15,
-    MAV_ACTION_CALIBRATE_RC = 16,
-    MAV_ACTION_CALIBRATE_GYRO = 17,
-    MAV_ACTION_CALIBRATE_MAG = 18,
-    MAV_ACTION_CALIBRATE_ACC = 19,
-    MAV_ACTION_CALIBRATE_PRESSURE = 20,
-    MAV_ACTION_REC_START = 21,
-    MAV_ACTION_REC_PAUSE = 22,
-    MAV_ACTION_REC_STOP = 23,
-    MAV_ACTION_TAKEOFF = 24,
-    MAV_ACTION_NAVIGATE = 25,
-    MAV_ACTION_LAND = 26,
-    MAV_ACTION_LOITER = 27,
-    MAV_ACTION_SET_ORIGIN = 28,
-    MAV_ACTION_RELAY_ON = 29,
-    MAV_ACTION_RELAY_OFF = 30,
-    MAV_ACTION_GET_IMAGE = 31,
-    MAV_ACTION_VIDEO_START = 32,
-    MAV_ACTION_VIDEO_STOP = 33,
-    MAV_ACTION_RESET_MAP = 34,
-    MAV_ACTION_RESET_PLAN = 35,
-    MAV_ACTION_DELAY_BEFORE_COMMAND = 36,
-    MAV_ACTION_ASCEND_AT_RATE = 37,
-    MAV_ACTION_CHANGE_MODE = 38,
-    MAV_ACTION_LOITER_MAX_TURNS = 39,
-    MAV_ACTION_LOITER_MAX_TIME = 40,
-    MAV_ACTION_START_HILSIM = 41,
-    MAV_ACTION_STOP_HILSIM = 42,    
-    MAV_ACTION_NB        ///< Number of MAV actions
-};
-
-enum MAV_MODE
-{
-    MAV_MODE_UNINIT = 0,     ///< System is in undefined state
-    MAV_MODE_LOCKED = 1,     ///< Motors are blocked, system is safe
-    MAV_MODE_MANUAL = 2,     ///< System is allowed to be active, under manual (RC) control
-    MAV_MODE_GUIDED = 3,     ///< System is allowed to be active, under autonomous control, manual setpoint
-    MAV_MODE_AUTO =   4,     ///< System is allowed to be active, under autonomous control and navigation
-    MAV_MODE_TEST1 =  5,     ///< Generic test mode, for custom use
-    MAV_MODE_TEST2 =  6,     ///< Generic test mode, for custom use
-    MAV_MODE_TEST3 =  7,     ///< Generic test mode, for custom use
-    MAV_MODE_READY =  8,     ///< System is ready, motors are unblocked, but controllers are inactive
-    MAV_MODE_RC_TRAINING = 9 ///< System is blocked, only RC valued are read and reported back
-};
-
-enum MAV_STATE
-{
-    MAV_STATE_UNINIT = 0,
-    MAV_STATE_BOOT,
-    MAV_STATE_CALIBRATING,
-    MAV_STATE_STANDBY,
-    MAV_STATE_ACTIVE,
-    MAV_STATE_CRITICAL,
-    MAV_STATE_EMERGENCY,
-    MAV_STATE_HILSIM,
-    MAV_STATE_POWEROFF
-};
-
-enum MAV_NAV
-{
-    MAV_NAV_GROUNDED = 0,
-    MAV_NAV_LIFTOFF,
-    MAV_NAV_HOLD,
-    MAV_NAV_WAYPOINT,
-    MAV_NAV_VECTOR,
-    MAV_NAV_RETURNING,
-    MAV_NAV_LANDING,
-    MAV_NAV_LOST,
-    MAV_NAV_LOITER,
-    MAV_NAV_FREE_DRIFT
-};
-
-enum MAV_TYPE
-{
-    MAV_GENERIC = 0,
-    MAV_FIXED_WING = 1,
-    MAV_QUADROTOR = 2,
-    MAV_COAXIAL = 3,
-    MAV_HELICOPTER = 4,
-    MAV_GROUND = 5,
-    OCU = 6,
-    MAV_AIRSHIP = 7,
-    MAV_FREE_BALLOON = 8,
-    MAV_ROCKET = 9,
-    UGV_GROUND_ROVER = 10,
-    UGV_SURFACE_SHIP = 11
-};
-
-enum MAV_AUTOPILOT_TYPE
-{
-    MAV_AUTOPILOT_GENERIC = 0,
-    MAV_AUTOPILOT_PIXHAWK = 1,
-    MAV_AUTOPILOT_SLUGS = 2,
-    MAV_AUTOPILOT_ARDUPILOTMEGA = 3,
-    MAV_AUTOPILOT_NONE = 4
-};
-
-enum MAV_COMPONENT
-{
-    MAV_COMP_ID_GPS,
-    MAV_COMP_ID_WAYPOINTPLANNER,
-    MAV_COMP_ID_BLOBTRACKER,
-    MAV_COMP_ID_PATHPLANNER,
-    MAV_COMP_ID_AIRSLAM,
-    MAV_COMP_ID_MAPPER,
-    MAV_COMP_ID_CAMERA,
-    MAV_COMP_ID_RADIO = 68,
-    MAV_COMP_ID_IMU = 200,
-    MAV_COMP_ID_IMU_2 = 201,
-    MAV_COMP_ID_IMU_3 = 202,
-    MAV_COMP_ID_UDP_BRIDGE = 240,
-    MAV_COMP_ID_UART_BRIDGE = 241,
-    MAV_COMP_ID_SYSTEM_CONTROL = 250
-};
-
-enum MAV_FRAME
-{
-    MAV_FRAME_GLOBAL = 0,
-    MAV_FRAME_LOCAL = 1,
-    MAV_FRAME_MISSION = 2,
-    MAV_FRAME_GLOBAL_RELATIVE_ALT = 3,
-    MAV_FRAME_LOCAL_ENU = 4
-};
-
-enum MAVLINK_DATA_STREAM_TYPE
-{
-    MAVLINK_DATA_STREAM_IMG_JPEG,
-    MAVLINK_DATA_STREAM_IMG_BMP,
-    MAVLINK_DATA_STREAM_IMG_RAW8U,
-    MAVLINK_DATA_STREAM_IMG_RAW32U,
-    MAVLINK_DATA_STREAM_IMG_PGM,
-    MAVLINK_DATA_STREAM_IMG_PNG
-};
-
-#ifndef MAVLINK_MAX_PAYLOAD_LEN
-// it is possible to override this, but be careful!
-#define MAVLINK_MAX_PAYLOAD_LEN 255 ///< Maximum payload length
-#endif
-
-#define MAVLINK_CORE_HEADER_LEN 5 ///< Length of core header (of the comm. layer): message length (1 byte) + message sequence (1 byte) + message system id (1 byte) + message component id (1 byte) + message type id (1 byte)
-#define MAVLINK_NUM_HEADER_BYTES (MAVLINK_CORE_HEADER_LEN + 1) ///< Length of all header bytes, including core and checksum
-#define MAVLINK_NUM_CHECKSUM_BYTES 2
-#define MAVLINK_NUM_NON_PAYLOAD_BYTES (MAVLINK_NUM_HEADER_BYTES + MAVLINK_NUM_CHECKSUM_BYTES)
-
-#define MAVLINK_MAX_PACKET_LEN (MAVLINK_MAX_PAYLOAD_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES) ///< Maximum packet length
-
-typedef struct param_union {
-	union {
-    float param_float;
-    int32_t param_int32;
-    uint32_t param_uint32;
-	};
-	uint8_t type;
-} mavlink_param_union_t;
-
-typedef struct __mavlink_system {
-    uint8_t sysid;   ///< Used by the MAVLink message_xx_send() convenience function
-    uint8_t compid;  ///< Used by the MAVLink message_xx_send() convenience function
-    uint8_t type;    ///< Unused, can be used by user to store the system's type
-    uint8_t state;   ///< Unused, can be used by user to store the system's state
-    uint8_t mode;    ///< Unused, can be used by user to store the system's mode
-    uint8_t nav_mode;    ///< Unused, can be used by user to store the system's navigation mode
-} mavlink_system_t;
-
-typedef struct __mavlink_message {
-	uint16_t checksum; /// sent at end of packet
-	uint8_t magic;   ///< protocol magic marker
-	uint8_t len;     ///< Length of payload
-	uint8_t seq;     ///< Sequence of packet
-	uint8_t sysid;   ///< ID of message sender system/aircraft
-	uint8_t compid;  ///< ID of the message sender component
-	uint8_t msgid;   ///< ID of message in payload
-	uint64_t payload64[(MAVLINK_MAX_PAYLOAD_LEN+MAVLINK_NUM_CHECKSUM_BYTES+7)/8];
-} mavlink_message_t;
-
-typedef enum {
-	MAVLINK_TYPE_CHAR     = 0,
-	MAVLINK_TYPE_UINT8_T  = 1,
-	MAVLINK_TYPE_INT8_T   = 2,
-	MAVLINK_TYPE_UINT16_T = 3,
-	MAVLINK_TYPE_INT16_T  = 4,
-	MAVLINK_TYPE_UINT32_T = 5,
-	MAVLINK_TYPE_INT32_T  = 6,
-	MAVLINK_TYPE_UINT64_T = 7,
-	MAVLINK_TYPE_INT64_T  = 8,
-	MAVLINK_TYPE_FLOAT    = 9,
-	MAVLINK_TYPE_DOUBLE   = 10
-} mavlink_message_type_t;
-
-#define MAVLINK_MAX_FIELDS 64
-
-typedef struct __mavlink_field_info {
-	const char *name;             // name of this field
-	const char *print_format;     // printing format hint, or NULL
-	mavlink_message_type_t type;  // type of this field
-	unsigned array_length;        // if non-zero, field is an array
-	unsigned wire_offset;         // offset of each field in the payload
-	unsigned structure_offset;    // offset in a C structure
-} mavlink_field_info_t;
-
-// note that in this structure the order of fields is the order
-// in the XML file, not necessary the wire order
-typedef struct __mavlink_message_info {
-	const char *name;                                      // name of the message
-	unsigned num_fields;                                   // how many fields in this message
-	mavlink_field_info_t fields[MAVLINK_MAX_FIELDS];       // field information
-} mavlink_message_info_t;
-
-#define _MAV_PAYLOAD(msg) ((char *)(&(msg)->payload64[0]))
-#define _MAV_PAYLOAD_NON_CONST(msg) ((char *)(&((msg)->payload64[0])))
-
-// checksum is immediately after the payload bytes
-#define mavlink_ck_a(msg) *(msg->len + (uint8_t *)_MAV_PAYLOAD(msg))
-#define mavlink_ck_b(msg) *((msg->len+(uint16_t)1) + (uint8_t *)_MAV_PAYLOAD(msg))
-
-typedef enum {
-    MAVLINK_COMM_0,
-    MAVLINK_COMM_1,
-    MAVLINK_COMM_2,
-    MAVLINK_COMM_3
-} mavlink_channel_t;
-
-/*
- * applications can set MAVLINK_COMM_NUM_BUFFERS to the maximum number
- * of buffers they will use. If more are used, then the result will be
- * a stack overrun
- */
-#ifndef MAVLINK_COMM_NUM_BUFFERS
-#if (defined linux) | (defined __linux) | (defined  __MACH__) | (defined _WIN32)
-# define MAVLINK_COMM_NUM_BUFFERS 16
-#else
-# define MAVLINK_COMM_NUM_BUFFERS 4
-#endif
-#endif
-
-typedef enum {
-    MAVLINK_PARSE_STATE_UNINIT=0,
-    MAVLINK_PARSE_STATE_IDLE,
-    MAVLINK_PARSE_STATE_GOT_STX,
-    MAVLINK_PARSE_STATE_GOT_SEQ,
-    MAVLINK_PARSE_STATE_GOT_LENGTH,
-    MAVLINK_PARSE_STATE_GOT_SYSID,
-    MAVLINK_PARSE_STATE_GOT_COMPID,
-    MAVLINK_PARSE_STATE_GOT_MSGID,
-    MAVLINK_PARSE_STATE_GOT_PAYLOAD,
-    MAVLINK_PARSE_STATE_GOT_CRC1
-} mavlink_parse_state_t; ///< The state machine for the comm parser
-
-typedef struct __mavlink_status {
-    uint8_t msg_received;               ///< Number of received messages
-    uint8_t buffer_overrun;             ///< Number of buffer overruns
-    uint8_t parse_error;                ///< Number of parse errors
-    mavlink_parse_state_t parse_state;  ///< Parsing state machine
-    uint8_t packet_idx;                 ///< Index in current packet
-    uint8_t current_rx_seq;             ///< Sequence number of last packet received
-    uint8_t current_tx_seq;             ///< Sequence number of last packet sent
-    uint16_t packet_rx_success_count;   ///< Received packets
-    uint16_t packet_rx_drop_count;      ///< Number of packet drops
-} mavlink_status_t;
-
-#define MAVLINK_BIG_ENDIAN 0
-#define MAVLINK_LITTLE_ENDIAN 1
-
-#endif /* MAVLINK_TYPES_H_ */
diff --git a/mavlink/include/mavlink/v0.9/minimal/mavlink.h b/mavlink/include/mavlink/v0.9/minimal/mavlink.h
deleted file mode 100644
index 3f1c8b429..000000000
--- a/mavlink/include/mavlink/v0.9/minimal/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from minimal.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "minimal.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/minimal/mavlink_msg_heartbeat.h b/mavlink/include/mavlink/v0.9/minimal/mavlink_msg_heartbeat.h
deleted file mode 100644
index aad90d29f..000000000
--- a/mavlink/include/mavlink/v0.9/minimal/mavlink_msg_heartbeat.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// MESSAGE HEARTBEAT PACKING
-
-#define MAVLINK_MSG_ID_HEARTBEAT 0
-
-typedef struct __mavlink_heartbeat_t
-{
- uint8_t type; ///< Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- uint8_t autopilot; ///< Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- uint8_t mavlink_version; ///< MAVLink version
-} mavlink_heartbeat_t;
-
-#define MAVLINK_MSG_ID_HEARTBEAT_LEN 3
-#define MAVLINK_MSG_ID_0_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_HEARTBEAT { \
-	"HEARTBEAT", \
-	3, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_heartbeat_t, type) }, \
-         { "autopilot", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_heartbeat_t, autopilot) }, \
-         { "mavlink_version", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_heartbeat_t, mavlink_version) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a heartbeat message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a heartbeat message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a heartbeat struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param heartbeat C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_heartbeat_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_heartbeat_t* heartbeat)
-{
-	return mavlink_msg_heartbeat_pack(system_id, component_id, msg, heartbeat->type, heartbeat->autopilot);
-}
-
-/**
- * @brief Send a heartbeat message
- * @param chan MAVLink channel to send the message
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_heartbeat_send(mavlink_channel_t chan, uint8_t type, uint8_t autopilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, autopilot);
-	_mav_put_uint8_t(buf, 2, 2);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, buf, 3);
-#else
-	mavlink_heartbeat_t packet;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.mavlink_version = 2;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE HEARTBEAT UNPACKING
-
-
-/**
- * @brief Get field type from heartbeat message
- *
- * @return Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- */
-static inline uint8_t mavlink_msg_heartbeat_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field autopilot from heartbeat message
- *
- * @return Type of the Autopilot: 0: Generic, 1: PIXHAWK, 2: SLUGS, 3: Ardupilot (up to 15 types), defined in MAV_AUTOPILOT_TYPE ENUM
- */
-static inline uint8_t mavlink_msg_heartbeat_get_autopilot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field mavlink_version from heartbeat message
- *
- * @return MAVLink version
- */
-static inline uint8_t mavlink_msg_heartbeat_get_mavlink_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a heartbeat message into a struct
- *
- * @param msg The message to decode
- * @param heartbeat C-struct to decode the message contents into
- */
-static inline void mavlink_msg_heartbeat_decode(const mavlink_message_t* msg, mavlink_heartbeat_t* heartbeat)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	heartbeat->type = mavlink_msg_heartbeat_get_type(msg);
-	heartbeat->autopilot = mavlink_msg_heartbeat_get_autopilot(msg);
-	heartbeat->mavlink_version = mavlink_msg_heartbeat_get_mavlink_version(msg);
-#else
-	memcpy(heartbeat, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/minimal/minimal.h b/mavlink/include/mavlink/v0.9/minimal/minimal.h
deleted file mode 100644
index 5979f806b..000000000
--- a/mavlink/include/mavlink/v0.9/minimal/minimal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from minimal.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef MINIMAL_H
-#define MINIMAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_MINIMAL
-
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-// ENUM DEFINITIONS
-
-
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_heartbeat.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // MINIMAL_H
diff --git a/mavlink/include/mavlink/v0.9/minimal/testsuite.h b/mavlink/include/mavlink/v0.9/minimal/testsuite.h
deleted file mode 100644
index be1d5ed6d..000000000
--- a/mavlink/include/mavlink/v0.9/minimal/testsuite.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from minimal.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef MINIMAL_TESTSUITE_H
-#define MINIMAL_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-
-static void mavlink_test_minimal(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-
-	mavlink_test_minimal(system_id, component_id, last_msg);
-}
-#endif
-
-
-
-
-static void mavlink_test_heartbeat(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_heartbeat_t packet_in = {
-		5,
-	72,
-	2,
-	};
-	mavlink_heartbeat_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.autopilot = packet_in.autopilot;
-        	packet1.mavlink_version = packet_in.mavlink_version;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack(system_id, component_id, &msg , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_send(MAVLINK_COMM_1 , packet1.type , packet1.autopilot );
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_minimal(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_heartbeat(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // MINIMAL_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/minimal/version.h b/mavlink/include/mavlink/v0.9/minimal/version.h
deleted file mode 100644
index d3f6e9b25..000000000
--- a/mavlink/include/mavlink/v0.9/minimal/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from minimal.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:49 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 3
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink.h
deleted file mode 100644
index 81c47524b..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from pixhawk.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "pixhawk.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_attitude_control.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_attitude_control.h
deleted file mode 100644
index 3d9acdc00..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_attitude_control.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE ATTITUDE_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_ATTITUDE_CONTROL 200
-
-typedef struct __mavlink_attitude_control_t
-{
- uint8_t target; ///< The system to be controlled
- float roll; ///< roll
- float pitch; ///< pitch
- float yaw; ///< yaw
- float thrust; ///< thrust
- uint8_t roll_manual; ///< roll control enabled auto:0, manual:1
- uint8_t pitch_manual; ///< pitch auto:0, manual:1
- uint8_t yaw_manual; ///< yaw auto:0, manual:1
- uint8_t thrust_manual; ///< thrust auto:0, manual:1
-} mavlink_attitude_control_t;
-
-#define MAVLINK_MSG_ID_ATTITUDE_CONTROL_LEN 21
-#define MAVLINK_MSG_ID_200_LEN 21
-
-
-
-#define MAVLINK_MESSAGE_INFO_ATTITUDE_CONTROL { \
-	"ATTITUDE_CONTROL", \
-	9, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_attitude_control_t, target) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_attitude_control_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_attitude_control_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_attitude_control_t, yaw) }, \
-         { "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_attitude_control_t, thrust) }, \
-         { "roll_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_attitude_control_t, roll_manual) }, \
-         { "pitch_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_attitude_control_t, pitch_manual) }, \
-         { "yaw_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 19, offsetof(mavlink_attitude_control_t, yaw_manual) }, \
-         { "thrust_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_attitude_control_t, thrust_manual) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a attitude_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_attitude_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, float roll, float pitch, float yaw, float thrust, uint8_t roll_manual, uint8_t pitch_manual, uint8_t yaw_manual, uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_attitude_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ATTITUDE_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 21);
-}
-
-/**
- * @brief Pack a attitude_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_attitude_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,float roll,float pitch,float yaw,float thrust,uint8_t roll_manual,uint8_t pitch_manual,uint8_t yaw_manual,uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
-#else
-	mavlink_attitude_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 21);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ATTITUDE_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 21);
-}
-
-/**
- * @brief Encode a attitude_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param attitude_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_attitude_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_attitude_control_t* attitude_control)
-{
-	return mavlink_msg_attitude_control_pack(system_id, component_id, msg, attitude_control->target, attitude_control->roll, attitude_control->pitch, attitude_control->yaw, attitude_control->thrust, attitude_control->roll_manual, attitude_control->pitch_manual, attitude_control->yaw_manual, attitude_control->thrust_manual);
-}
-
-/**
- * @brief Send a attitude_control message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system to be controlled
- * @param roll roll
- * @param pitch pitch
- * @param yaw yaw
- * @param thrust thrust
- * @param roll_manual roll control enabled auto:0, manual:1
- * @param pitch_manual pitch auto:0, manual:1
- * @param yaw_manual yaw auto:0, manual:1
- * @param thrust_manual thrust auto:0, manual:1
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_attitude_control_send(mavlink_channel_t chan, uint8_t target, float roll, float pitch, float yaw, float thrust, uint8_t roll_manual, uint8_t pitch_manual, uint8_t yaw_manual, uint8_t thrust_manual)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[21];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, roll);
-	_mav_put_float(buf, 5, pitch);
-	_mav_put_float(buf, 9, yaw);
-	_mav_put_float(buf, 13, thrust);
-	_mav_put_uint8_t(buf, 17, roll_manual);
-	_mav_put_uint8_t(buf, 18, pitch_manual);
-	_mav_put_uint8_t(buf, 19, yaw_manual);
-	_mav_put_uint8_t(buf, 20, thrust_manual);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, buf, 21);
-#else
-	mavlink_attitude_control_t packet;
-	packet.target = target;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.thrust = thrust;
-	packet.roll_manual = roll_manual;
-	packet.pitch_manual = pitch_manual;
-	packet.yaw_manual = yaw_manual;
-	packet.thrust_manual = thrust_manual;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, (const char *)&packet, 21);
-#endif
-}
-
-#endif
-
-// MESSAGE ATTITUDE_CONTROL UNPACKING
-
-
-/**
- * @brief Get field target from attitude_control message
- *
- * @return The system to be controlled
- */
-static inline uint8_t mavlink_msg_attitude_control_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field roll from attitude_control message
- *
- * @return roll
- */
-static inline float mavlink_msg_attitude_control_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Get field pitch from attitude_control message
- *
- * @return pitch
- */
-static inline float mavlink_msg_attitude_control_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field yaw from attitude_control message
- *
- * @return yaw
- */
-static inline float mavlink_msg_attitude_control_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field thrust from attitude_control message
- *
- * @return thrust
- */
-static inline float mavlink_msg_attitude_control_get_thrust(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field roll_manual from attitude_control message
- *
- * @return roll control enabled auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_attitude_control_get_roll_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  17);
-}
-
-/**
- * @brief Get field pitch_manual from attitude_control message
- *
- * @return pitch auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_attitude_control_get_pitch_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  18);
-}
-
-/**
- * @brief Get field yaw_manual from attitude_control message
- *
- * @return yaw auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_attitude_control_get_yaw_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  19);
-}
-
-/**
- * @brief Get field thrust_manual from attitude_control message
- *
- * @return thrust auto:0, manual:1
- */
-static inline uint8_t mavlink_msg_attitude_control_get_thrust_manual(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  20);
-}
-
-/**
- * @brief Decode a attitude_control message into a struct
- *
- * @param msg The message to decode
- * @param attitude_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_attitude_control_decode(const mavlink_message_t* msg, mavlink_attitude_control_t* attitude_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	attitude_control->target = mavlink_msg_attitude_control_get_target(msg);
-	attitude_control->roll = mavlink_msg_attitude_control_get_roll(msg);
-	attitude_control->pitch = mavlink_msg_attitude_control_get_pitch(msg);
-	attitude_control->yaw = mavlink_msg_attitude_control_get_yaw(msg);
-	attitude_control->thrust = mavlink_msg_attitude_control_get_thrust(msg);
-	attitude_control->roll_manual = mavlink_msg_attitude_control_get_roll_manual(msg);
-	attitude_control->pitch_manual = mavlink_msg_attitude_control_get_pitch_manual(msg);
-	attitude_control->yaw_manual = mavlink_msg_attitude_control_get_yaw_manual(msg);
-	attitude_control->thrust_manual = mavlink_msg_attitude_control_get_thrust_manual(msg);
-#else
-	memcpy(attitude_control, _MAV_PAYLOAD(msg), 21);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_brief_feature.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_brief_feature.h
deleted file mode 100644
index 866d1be44..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_brief_feature.h
+++ /dev/null
@@ -1,292 +0,0 @@
-// MESSAGE BRIEF_FEATURE PACKING
-
-#define MAVLINK_MSG_ID_BRIEF_FEATURE 195
-
-typedef struct __mavlink_brief_feature_t
-{
- float x; ///< x position in m
- float y; ///< y position in m
- float z; ///< z position in m
- uint8_t orientation_assignment; ///< Orientation assignment 0: false, 1:true
- uint16_t size; ///< Size in pixels
- uint16_t orientation; ///< Orientation
- uint8_t descriptor[32]; ///< Descriptor
- float response; ///< Harris operator response at this location
-} mavlink_brief_feature_t;
-
-#define MAVLINK_MSG_ID_BRIEF_FEATURE_LEN 53
-#define MAVLINK_MSG_ID_195_LEN 53
-
-#define MAVLINK_MSG_BRIEF_FEATURE_FIELD_DESCRIPTOR_LEN 32
-
-#define MAVLINK_MESSAGE_INFO_BRIEF_FEATURE { \
-	"BRIEF_FEATURE", \
-	8, \
-	{  { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_brief_feature_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_brief_feature_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_brief_feature_t, z) }, \
-         { "orientation_assignment", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_brief_feature_t, orientation_assignment) }, \
-         { "size", NULL, MAVLINK_TYPE_UINT16_T, 0, 13, offsetof(mavlink_brief_feature_t, size) }, \
-         { "orientation", NULL, MAVLINK_TYPE_UINT16_T, 0, 15, offsetof(mavlink_brief_feature_t, orientation) }, \
-         { "descriptor", NULL, MAVLINK_TYPE_UINT8_T, 32, 17, offsetof(mavlink_brief_feature_t, descriptor) }, \
-         { "response", NULL, MAVLINK_TYPE_FLOAT, 0, 49, offsetof(mavlink_brief_feature_t, response) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a brief_feature message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param x x position in m
- * @param y y position in m
- * @param z z position in m
- * @param orientation_assignment Orientation assignment 0: false, 1:true
- * @param size Size in pixels
- * @param orientation Orientation
- * @param descriptor Descriptor
- * @param response Harris operator response at this location
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_brief_feature_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float x, float y, float z, uint8_t orientation_assignment, uint16_t size, uint16_t orientation, const uint8_t *descriptor, float response)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[53];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_uint8_t(buf, 12, orientation_assignment);
-	_mav_put_uint16_t(buf, 13, size);
-	_mav_put_uint16_t(buf, 15, orientation);
-	_mav_put_float(buf, 49, response);
-	_mav_put_uint8_t_array(buf, 17, descriptor, 32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 53);
-#else
-	mavlink_brief_feature_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.orientation_assignment = orientation_assignment;
-	packet.size = size;
-	packet.orientation = orientation;
-	packet.response = response;
-	mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 53);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BRIEF_FEATURE;
-	return mavlink_finalize_message(msg, system_id, component_id, 53);
-}
-
-/**
- * @brief Pack a brief_feature message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param x x position in m
- * @param y y position in m
- * @param z z position in m
- * @param orientation_assignment Orientation assignment 0: false, 1:true
- * @param size Size in pixels
- * @param orientation Orientation
- * @param descriptor Descriptor
- * @param response Harris operator response at this location
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_brief_feature_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float x,float y,float z,uint8_t orientation_assignment,uint16_t size,uint16_t orientation,const uint8_t *descriptor,float response)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[53];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_uint8_t(buf, 12, orientation_assignment);
-	_mav_put_uint16_t(buf, 13, size);
-	_mav_put_uint16_t(buf, 15, orientation);
-	_mav_put_float(buf, 49, response);
-	_mav_put_uint8_t_array(buf, 17, descriptor, 32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 53);
-#else
-	mavlink_brief_feature_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.orientation_assignment = orientation_assignment;
-	packet.size = size;
-	packet.orientation = orientation;
-	packet.response = response;
-	mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 53);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BRIEF_FEATURE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 53);
-}
-
-/**
- * @brief Encode a brief_feature struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param brief_feature C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_brief_feature_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_brief_feature_t* brief_feature)
-{
-	return mavlink_msg_brief_feature_pack(system_id, component_id, msg, brief_feature->x, brief_feature->y, brief_feature->z, brief_feature->orientation_assignment, brief_feature->size, brief_feature->orientation, brief_feature->descriptor, brief_feature->response);
-}
-
-/**
- * @brief Send a brief_feature message
- * @param chan MAVLink channel to send the message
- *
- * @param x x position in m
- * @param y y position in m
- * @param z z position in m
- * @param orientation_assignment Orientation assignment 0: false, 1:true
- * @param size Size in pixels
- * @param orientation Orientation
- * @param descriptor Descriptor
- * @param response Harris operator response at this location
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_brief_feature_send(mavlink_channel_t chan, float x, float y, float z, uint8_t orientation_assignment, uint16_t size, uint16_t orientation, const uint8_t *descriptor, float response)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[53];
-	_mav_put_float(buf, 0, x);
-	_mav_put_float(buf, 4, y);
-	_mav_put_float(buf, 8, z);
-	_mav_put_uint8_t(buf, 12, orientation_assignment);
-	_mav_put_uint16_t(buf, 13, size);
-	_mav_put_uint16_t(buf, 15, orientation);
-	_mav_put_float(buf, 49, response);
-	_mav_put_uint8_t_array(buf, 17, descriptor, 32);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, buf, 53);
-#else
-	mavlink_brief_feature_t packet;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.orientation_assignment = orientation_assignment;
-	packet.size = size;
-	packet.orientation = orientation;
-	packet.response = response;
-	mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, (const char *)&packet, 53);
-#endif
-}
-
-#endif
-
-// MESSAGE BRIEF_FEATURE UNPACKING
-
-
-/**
- * @brief Get field x from brief_feature message
- *
- * @return x position in m
- */
-static inline float mavlink_msg_brief_feature_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field y from brief_feature message
- *
- * @return y position in m
- */
-static inline float mavlink_msg_brief_feature_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field z from brief_feature message
- *
- * @return z position in m
- */
-static inline float mavlink_msg_brief_feature_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field orientation_assignment from brief_feature message
- *
- * @return Orientation assignment 0: false, 1:true
- */
-static inline uint8_t mavlink_msg_brief_feature_get_orientation_assignment(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  12);
-}
-
-/**
- * @brief Get field size from brief_feature message
- *
- * @return Size in pixels
- */
-static inline uint16_t mavlink_msg_brief_feature_get_size(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  13);
-}
-
-/**
- * @brief Get field orientation from brief_feature message
- *
- * @return Orientation
- */
-static inline uint16_t mavlink_msg_brief_feature_get_orientation(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  15);
-}
-
-/**
- * @brief Get field descriptor from brief_feature message
- *
- * @return Descriptor
- */
-static inline uint16_t mavlink_msg_brief_feature_get_descriptor(const mavlink_message_t* msg, uint8_t *descriptor)
-{
-	return _MAV_RETURN_uint8_t_array(msg, descriptor, 32,  17);
-}
-
-/**
- * @brief Get field response from brief_feature message
- *
- * @return Harris operator response at this location
- */
-static inline float mavlink_msg_brief_feature_get_response(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  49);
-}
-
-/**
- * @brief Decode a brief_feature message into a struct
- *
- * @param msg The message to decode
- * @param brief_feature C-struct to decode the message contents into
- */
-static inline void mavlink_msg_brief_feature_decode(const mavlink_message_t* msg, mavlink_brief_feature_t* brief_feature)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	brief_feature->x = mavlink_msg_brief_feature_get_x(msg);
-	brief_feature->y = mavlink_msg_brief_feature_get_y(msg);
-	brief_feature->z = mavlink_msg_brief_feature_get_z(msg);
-	brief_feature->orientation_assignment = mavlink_msg_brief_feature_get_orientation_assignment(msg);
-	brief_feature->size = mavlink_msg_brief_feature_get_size(msg);
-	brief_feature->orientation = mavlink_msg_brief_feature_get_orientation(msg);
-	mavlink_msg_brief_feature_get_descriptor(msg, brief_feature->descriptor);
-	brief_feature->response = mavlink_msg_brief_feature_get_response(msg);
-#else
-	memcpy(brief_feature, _MAV_PAYLOAD(msg), 53);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_data_transmission_handshake.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_data_transmission_handshake.h
deleted file mode 100644
index 9c0d75a9a..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_data_transmission_handshake.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE DATA_TRANSMISSION_HANDSHAKE PACKING
-
-#define MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE 193
-
-typedef struct __mavlink_data_transmission_handshake_t
-{
- uint8_t type; ///< type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)
- uint32_t size; ///< total data size in bytes (set on ACK only)
- uint8_t packets; ///< number of packets beeing sent (set on ACK only)
- uint8_t payload; ///< payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)
- uint8_t jpg_quality; ///< JPEG quality out of [1,100]
-} mavlink_data_transmission_handshake_t;
-
-#define MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE_LEN 8
-#define MAVLINK_MSG_ID_193_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_DATA_TRANSMISSION_HANDSHAKE { \
-	"DATA_TRANSMISSION_HANDSHAKE", \
-	5, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_data_transmission_handshake_t, type) }, \
-         { "size", NULL, MAVLINK_TYPE_UINT32_T, 0, 1, offsetof(mavlink_data_transmission_handshake_t, size) }, \
-         { "packets", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_data_transmission_handshake_t, packets) }, \
-         { "payload", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_data_transmission_handshake_t, payload) }, \
-         { "jpg_quality", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_data_transmission_handshake_t, jpg_quality) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a data_transmission_handshake message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)
- * @param size total data size in bytes (set on ACK only)
- * @param packets number of packets beeing sent (set on ACK only)
- * @param payload payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)
- * @param jpg_quality JPEG quality out of [1,100]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_transmission_handshake_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint32_t size, uint8_t packets, uint8_t payload, uint8_t jpg_quality)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint32_t(buf, 1, size);
-	_mav_put_uint8_t(buf, 5, packets);
-	_mav_put_uint8_t(buf, 6, payload);
-	_mav_put_uint8_t(buf, 7, jpg_quality);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_data_transmission_handshake_t packet;
-	packet.type = type;
-	packet.size = size;
-	packet.packets = packets;
-	packet.payload = payload;
-	packet.jpg_quality = jpg_quality;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE;
-	return mavlink_finalize_message(msg, system_id, component_id, 8);
-}
-
-/**
- * @brief Pack a data_transmission_handshake message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)
- * @param size total data size in bytes (set on ACK only)
- * @param packets number of packets beeing sent (set on ACK only)
- * @param payload payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)
- * @param jpg_quality JPEG quality out of [1,100]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_transmission_handshake_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint32_t size,uint8_t packets,uint8_t payload,uint8_t jpg_quality)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint32_t(buf, 1, size);
-	_mav_put_uint8_t(buf, 5, packets);
-	_mav_put_uint8_t(buf, 6, payload);
-	_mav_put_uint8_t(buf, 7, jpg_quality);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 8);
-#else
-	mavlink_data_transmission_handshake_t packet;
-	packet.type = type;
-	packet.size = size;
-	packet.packets = packets;
-	packet.payload = payload;
-	packet.jpg_quality = jpg_quality;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8);
-}
-
-/**
- * @brief Encode a data_transmission_handshake struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param data_transmission_handshake C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_data_transmission_handshake_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_data_transmission_handshake_t* data_transmission_handshake)
-{
-	return mavlink_msg_data_transmission_handshake_pack(system_id, component_id, msg, data_transmission_handshake->type, data_transmission_handshake->size, data_transmission_handshake->packets, data_transmission_handshake->payload, data_transmission_handshake->jpg_quality);
-}
-
-/**
- * @brief Send a data_transmission_handshake message
- * @param chan MAVLink channel to send the message
- *
- * @param type type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)
- * @param size total data size in bytes (set on ACK only)
- * @param packets number of packets beeing sent (set on ACK only)
- * @param payload payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)
- * @param jpg_quality JPEG quality out of [1,100]
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_data_transmission_handshake_send(mavlink_channel_t chan, uint8_t type, uint32_t size, uint8_t packets, uint8_t payload, uint8_t jpg_quality)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint32_t(buf, 1, size);
-	_mav_put_uint8_t(buf, 5, packets);
-	_mav_put_uint8_t(buf, 6, payload);
-	_mav_put_uint8_t(buf, 7, jpg_quality);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE, buf, 8);
-#else
-	mavlink_data_transmission_handshake_t packet;
-	packet.type = type;
-	packet.size = size;
-	packet.packets = packets;
-	packet.payload = payload;
-	packet.jpg_quality = jpg_quality;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE, (const char *)&packet, 8);
-#endif
-}
-
-#endif
-
-// MESSAGE DATA_TRANSMISSION_HANDSHAKE UNPACKING
-
-
-/**
- * @brief Get field type from data_transmission_handshake message
- *
- * @return type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)
- */
-static inline uint8_t mavlink_msg_data_transmission_handshake_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field size from data_transmission_handshake message
- *
- * @return total data size in bytes (set on ACK only)
- */
-static inline uint32_t mavlink_msg_data_transmission_handshake_get_size(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  1);
-}
-
-/**
- * @brief Get field packets from data_transmission_handshake message
- *
- * @return number of packets beeing sent (set on ACK only)
- */
-static inline uint8_t mavlink_msg_data_transmission_handshake_get_packets(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field payload from data_transmission_handshake message
- *
- * @return payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)
- */
-static inline uint8_t mavlink_msg_data_transmission_handshake_get_payload(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field jpg_quality from data_transmission_handshake message
- *
- * @return JPEG quality out of [1,100]
- */
-static inline uint8_t mavlink_msg_data_transmission_handshake_get_jpg_quality(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Decode a data_transmission_handshake message into a struct
- *
- * @param msg The message to decode
- * @param data_transmission_handshake C-struct to decode the message contents into
- */
-static inline void mavlink_msg_data_transmission_handshake_decode(const mavlink_message_t* msg, mavlink_data_transmission_handshake_t* data_transmission_handshake)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	data_transmission_handshake->type = mavlink_msg_data_transmission_handshake_get_type(msg);
-	data_transmission_handshake->size = mavlink_msg_data_transmission_handshake_get_size(msg);
-	data_transmission_handshake->packets = mavlink_msg_data_transmission_handshake_get_packets(msg);
-	data_transmission_handshake->payload = mavlink_msg_data_transmission_handshake_get_payload(msg);
-	data_transmission_handshake->jpg_quality = mavlink_msg_data_transmission_handshake_get_jpg_quality(msg);
-#else
-	memcpy(data_transmission_handshake, _MAV_PAYLOAD(msg), 8);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_encapsulated_data.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_encapsulated_data.h
deleted file mode 100644
index 705a6cc29..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_encapsulated_data.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// MESSAGE ENCAPSULATED_DATA PACKING
-
-#define MAVLINK_MSG_ID_ENCAPSULATED_DATA 194
-
-typedef struct __mavlink_encapsulated_data_t
-{
- uint16_t seqnr; ///< sequence number (starting with 0 on every transmission)
- uint8_t data[253]; ///< image data bytes
-} mavlink_encapsulated_data_t;
-
-#define MAVLINK_MSG_ID_ENCAPSULATED_DATA_LEN 255
-#define MAVLINK_MSG_ID_194_LEN 255
-
-#define MAVLINK_MSG_ENCAPSULATED_DATA_FIELD_DATA_LEN 253
-
-#define MAVLINK_MESSAGE_INFO_ENCAPSULATED_DATA { \
-	"ENCAPSULATED_DATA", \
-	2, \
-	{  { "seqnr", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_encapsulated_data_t, seqnr) }, \
-         { "data", NULL, MAVLINK_TYPE_UINT8_T, 253, 2, offsetof(mavlink_encapsulated_data_t, data) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a encapsulated_data message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param seqnr sequence number (starting with 0 on every transmission)
- * @param data image data bytes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_encapsulated_data_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t seqnr, const uint8_t *data)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, seqnr);
-	_mav_put_uint8_t_array(buf, 2, data, 253);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
-#else
-	mavlink_encapsulated_data_t packet;
-	packet.seqnr = seqnr;
-	mav_array_memcpy(packet.data, data, sizeof(uint8_t)*253);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ENCAPSULATED_DATA;
-	return mavlink_finalize_message(msg, system_id, component_id, 255);
-}
-
-/**
- * @brief Pack a encapsulated_data message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param seqnr sequence number (starting with 0 on every transmission)
- * @param data image data bytes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_encapsulated_data_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t seqnr,const uint8_t *data)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, seqnr);
-	_mav_put_uint8_t_array(buf, 2, data, 253);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
-#else
-	mavlink_encapsulated_data_t packet;
-	packet.seqnr = seqnr;
-	mav_array_memcpy(packet.data, data, sizeof(uint8_t)*253);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ENCAPSULATED_DATA;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255);
-}
-
-/**
- * @brief Encode a encapsulated_data struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param encapsulated_data C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_encapsulated_data_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_encapsulated_data_t* encapsulated_data)
-{
-	return mavlink_msg_encapsulated_data_pack(system_id, component_id, msg, encapsulated_data->seqnr, encapsulated_data->data);
-}
-
-/**
- * @brief Send a encapsulated_data message
- * @param chan MAVLink channel to send the message
- *
- * @param seqnr sequence number (starting with 0 on every transmission)
- * @param data image data bytes
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_encapsulated_data_send(mavlink_channel_t chan, uint16_t seqnr, const uint8_t *data)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, seqnr);
-	_mav_put_uint8_t_array(buf, 2, data, 253);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, buf, 255);
-#else
-	mavlink_encapsulated_data_t packet;
-	packet.seqnr = seqnr;
-	mav_array_memcpy(packet.data, data, sizeof(uint8_t)*253);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, (const char *)&packet, 255);
-#endif
-}
-
-#endif
-
-// MESSAGE ENCAPSULATED_DATA UNPACKING
-
-
-/**
- * @brief Get field seqnr from encapsulated_data message
- *
- * @return sequence number (starting with 0 on every transmission)
- */
-static inline uint16_t mavlink_msg_encapsulated_data_get_seqnr(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field data from encapsulated_data message
- *
- * @return image data bytes
- */
-static inline uint16_t mavlink_msg_encapsulated_data_get_data(const mavlink_message_t* msg, uint8_t *data)
-{
-	return _MAV_RETURN_uint8_t_array(msg, data, 253,  2);
-}
-
-/**
- * @brief Decode a encapsulated_data message into a struct
- *
- * @param msg The message to decode
- * @param encapsulated_data C-struct to decode the message contents into
- */
-static inline void mavlink_msg_encapsulated_data_decode(const mavlink_message_t* msg, mavlink_encapsulated_data_t* encapsulated_data)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	encapsulated_data->seqnr = mavlink_msg_encapsulated_data_get_seqnr(msg);
-	mavlink_msg_encapsulated_data_get_data(msg, encapsulated_data->data);
-#else
-	memcpy(encapsulated_data, _MAV_PAYLOAD(msg), 255);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_available.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_available.h
deleted file mode 100644
index 40d1901c6..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_available.h
+++ /dev/null
@@ -1,628 +0,0 @@
-// MESSAGE IMAGE_AVAILABLE PACKING
-
-#define MAVLINK_MSG_ID_IMAGE_AVAILABLE 154
-
-typedef struct __mavlink_image_available_t
-{
- uint64_t cam_id; ///< Camera id
- uint8_t cam_no; ///< Camera # (starts with 0)
- uint64_t timestamp; ///< Timestamp
- uint64_t valid_until; ///< Until which timestamp this buffer will stay valid
- uint32_t img_seq; ///< The image sequence number
- uint32_t img_buf_index; ///< Position of the image in the buffer, starts with 0
- uint16_t width; ///< Image width
- uint16_t height; ///< Image height
- uint16_t depth; ///< Image depth
- uint8_t channels; ///< Image channels
- uint32_t key; ///< Shared memory area key
- uint32_t exposure; ///< Exposure time, in microseconds
- float gain; ///< Camera gain
- float roll; ///< Roll angle in rad
- float pitch; ///< Pitch angle in rad
- float yaw; ///< Yaw angle in rad
- float local_z; ///< Local frame Z coordinate (height over ground)
- float lat; ///< GPS X coordinate
- float lon; ///< GPS Y coordinate
- float alt; ///< Global frame altitude
- float ground_x; ///< Ground truth X
- float ground_y; ///< Ground truth Y
- float ground_z; ///< Ground truth Z
-} mavlink_image_available_t;
-
-#define MAVLINK_MSG_ID_IMAGE_AVAILABLE_LEN 92
-#define MAVLINK_MSG_ID_154_LEN 92
-
-
-
-#define MAVLINK_MESSAGE_INFO_IMAGE_AVAILABLE { \
-	"IMAGE_AVAILABLE", \
-	23, \
-	{  { "cam_id", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_image_available_t, cam_id) }, \
-         { "cam_no", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_image_available_t, cam_no) }, \
-         { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 9, offsetof(mavlink_image_available_t, timestamp) }, \
-         { "valid_until", NULL, MAVLINK_TYPE_UINT64_T, 0, 17, offsetof(mavlink_image_available_t, valid_until) }, \
-         { "img_seq", NULL, MAVLINK_TYPE_UINT32_T, 0, 25, offsetof(mavlink_image_available_t, img_seq) }, \
-         { "img_buf_index", NULL, MAVLINK_TYPE_UINT32_T, 0, 29, offsetof(mavlink_image_available_t, img_buf_index) }, \
-         { "width", NULL, MAVLINK_TYPE_UINT16_T, 0, 33, offsetof(mavlink_image_available_t, width) }, \
-         { "height", NULL, MAVLINK_TYPE_UINT16_T, 0, 35, offsetof(mavlink_image_available_t, height) }, \
-         { "depth", NULL, MAVLINK_TYPE_UINT16_T, 0, 37, offsetof(mavlink_image_available_t, depth) }, \
-         { "channels", NULL, MAVLINK_TYPE_UINT8_T, 0, 39, offsetof(mavlink_image_available_t, channels) }, \
-         { "key", NULL, MAVLINK_TYPE_UINT32_T, 0, 40, offsetof(mavlink_image_available_t, key) }, \
-         { "exposure", NULL, MAVLINK_TYPE_UINT32_T, 0, 44, offsetof(mavlink_image_available_t, exposure) }, \
-         { "gain", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_image_available_t, gain) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_image_available_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_image_available_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_image_available_t, yaw) }, \
-         { "local_z", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_image_available_t, local_z) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_image_available_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_image_available_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_image_available_t, alt) }, \
-         { "ground_x", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_image_available_t, ground_x) }, \
-         { "ground_y", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_image_available_t, ground_y) }, \
-         { "ground_z", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_image_available_t, ground_z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a image_available message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param cam_id Camera id
- * @param cam_no Camera # (starts with 0)
- * @param timestamp Timestamp
- * @param valid_until Until which timestamp this buffer will stay valid
- * @param img_seq The image sequence number
- * @param img_buf_index Position of the image in the buffer, starts with 0
- * @param width Image width
- * @param height Image height
- * @param depth Image depth
- * @param channels Image channels
- * @param key Shared memory area key
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_available_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t cam_id, uint8_t cam_no, uint64_t timestamp, uint64_t valid_until, uint32_t img_seq, uint32_t img_buf_index, uint16_t width, uint16_t height, uint16_t depth, uint8_t channels, uint32_t key, uint32_t exposure, float gain, float roll, float pitch, float yaw, float local_z, float lat, float lon, float alt, float ground_x, float ground_y, float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[92];
-	_mav_put_uint64_t(buf, 0, cam_id);
-	_mav_put_uint8_t(buf, 8, cam_no);
-	_mav_put_uint64_t(buf, 9, timestamp);
-	_mav_put_uint64_t(buf, 17, valid_until);
-	_mav_put_uint32_t(buf, 25, img_seq);
-	_mav_put_uint32_t(buf, 29, img_buf_index);
-	_mav_put_uint16_t(buf, 33, width);
-	_mav_put_uint16_t(buf, 35, height);
-	_mav_put_uint16_t(buf, 37, depth);
-	_mav_put_uint8_t(buf, 39, channels);
-	_mav_put_uint32_t(buf, 40, key);
-	_mav_put_uint32_t(buf, 44, exposure);
-	_mav_put_float(buf, 48, gain);
-	_mav_put_float(buf, 52, roll);
-	_mav_put_float(buf, 56, pitch);
-	_mav_put_float(buf, 60, yaw);
-	_mav_put_float(buf, 64, local_z);
-	_mav_put_float(buf, 68, lat);
-	_mav_put_float(buf, 72, lon);
-	_mav_put_float(buf, 76, alt);
-	_mav_put_float(buf, 80, ground_x);
-	_mav_put_float(buf, 84, ground_y);
-	_mav_put_float(buf, 88, ground_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 92);
-#else
-	mavlink_image_available_t packet;
-	packet.cam_id = cam_id;
-	packet.cam_no = cam_no;
-	packet.timestamp = timestamp;
-	packet.valid_until = valid_until;
-	packet.img_seq = img_seq;
-	packet.img_buf_index = img_buf_index;
-	packet.width = width;
-	packet.height = height;
-	packet.depth = depth;
-	packet.channels = channels;
-	packet.key = key;
-	packet.exposure = exposure;
-	packet.gain = gain;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 92);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_AVAILABLE;
-	return mavlink_finalize_message(msg, system_id, component_id, 92);
-}
-
-/**
- * @brief Pack a image_available message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param cam_id Camera id
- * @param cam_no Camera # (starts with 0)
- * @param timestamp Timestamp
- * @param valid_until Until which timestamp this buffer will stay valid
- * @param img_seq The image sequence number
- * @param img_buf_index Position of the image in the buffer, starts with 0
- * @param width Image width
- * @param height Image height
- * @param depth Image depth
- * @param channels Image channels
- * @param key Shared memory area key
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_available_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t cam_id,uint8_t cam_no,uint64_t timestamp,uint64_t valid_until,uint32_t img_seq,uint32_t img_buf_index,uint16_t width,uint16_t height,uint16_t depth,uint8_t channels,uint32_t key,uint32_t exposure,float gain,float roll,float pitch,float yaw,float local_z,float lat,float lon,float alt,float ground_x,float ground_y,float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[92];
-	_mav_put_uint64_t(buf, 0, cam_id);
-	_mav_put_uint8_t(buf, 8, cam_no);
-	_mav_put_uint64_t(buf, 9, timestamp);
-	_mav_put_uint64_t(buf, 17, valid_until);
-	_mav_put_uint32_t(buf, 25, img_seq);
-	_mav_put_uint32_t(buf, 29, img_buf_index);
-	_mav_put_uint16_t(buf, 33, width);
-	_mav_put_uint16_t(buf, 35, height);
-	_mav_put_uint16_t(buf, 37, depth);
-	_mav_put_uint8_t(buf, 39, channels);
-	_mav_put_uint32_t(buf, 40, key);
-	_mav_put_uint32_t(buf, 44, exposure);
-	_mav_put_float(buf, 48, gain);
-	_mav_put_float(buf, 52, roll);
-	_mav_put_float(buf, 56, pitch);
-	_mav_put_float(buf, 60, yaw);
-	_mav_put_float(buf, 64, local_z);
-	_mav_put_float(buf, 68, lat);
-	_mav_put_float(buf, 72, lon);
-	_mav_put_float(buf, 76, alt);
-	_mav_put_float(buf, 80, ground_x);
-	_mav_put_float(buf, 84, ground_y);
-	_mav_put_float(buf, 88, ground_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 92);
-#else
-	mavlink_image_available_t packet;
-	packet.cam_id = cam_id;
-	packet.cam_no = cam_no;
-	packet.timestamp = timestamp;
-	packet.valid_until = valid_until;
-	packet.img_seq = img_seq;
-	packet.img_buf_index = img_buf_index;
-	packet.width = width;
-	packet.height = height;
-	packet.depth = depth;
-	packet.channels = channels;
-	packet.key = key;
-	packet.exposure = exposure;
-	packet.gain = gain;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 92);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_AVAILABLE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 92);
-}
-
-/**
- * @brief Encode a image_available struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param image_available C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_image_available_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_image_available_t* image_available)
-{
-	return mavlink_msg_image_available_pack(system_id, component_id, msg, image_available->cam_id, image_available->cam_no, image_available->timestamp, image_available->valid_until, image_available->img_seq, image_available->img_buf_index, image_available->width, image_available->height, image_available->depth, image_available->channels, image_available->key, image_available->exposure, image_available->gain, image_available->roll, image_available->pitch, image_available->yaw, image_available->local_z, image_available->lat, image_available->lon, image_available->alt, image_available->ground_x, image_available->ground_y, image_available->ground_z);
-}
-
-/**
- * @brief Send a image_available message
- * @param chan MAVLink channel to send the message
- *
- * @param cam_id Camera id
- * @param cam_no Camera # (starts with 0)
- * @param timestamp Timestamp
- * @param valid_until Until which timestamp this buffer will stay valid
- * @param img_seq The image sequence number
- * @param img_buf_index Position of the image in the buffer, starts with 0
- * @param width Image width
- * @param height Image height
- * @param depth Image depth
- * @param channels Image channels
- * @param key Shared memory area key
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_image_available_send(mavlink_channel_t chan, uint64_t cam_id, uint8_t cam_no, uint64_t timestamp, uint64_t valid_until, uint32_t img_seq, uint32_t img_buf_index, uint16_t width, uint16_t height, uint16_t depth, uint8_t channels, uint32_t key, uint32_t exposure, float gain, float roll, float pitch, float yaw, float local_z, float lat, float lon, float alt, float ground_x, float ground_y, float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[92];
-	_mav_put_uint64_t(buf, 0, cam_id);
-	_mav_put_uint8_t(buf, 8, cam_no);
-	_mav_put_uint64_t(buf, 9, timestamp);
-	_mav_put_uint64_t(buf, 17, valid_until);
-	_mav_put_uint32_t(buf, 25, img_seq);
-	_mav_put_uint32_t(buf, 29, img_buf_index);
-	_mav_put_uint16_t(buf, 33, width);
-	_mav_put_uint16_t(buf, 35, height);
-	_mav_put_uint16_t(buf, 37, depth);
-	_mav_put_uint8_t(buf, 39, channels);
-	_mav_put_uint32_t(buf, 40, key);
-	_mav_put_uint32_t(buf, 44, exposure);
-	_mav_put_float(buf, 48, gain);
-	_mav_put_float(buf, 52, roll);
-	_mav_put_float(buf, 56, pitch);
-	_mav_put_float(buf, 60, yaw);
-	_mav_put_float(buf, 64, local_z);
-	_mav_put_float(buf, 68, lat);
-	_mav_put_float(buf, 72, lon);
-	_mav_put_float(buf, 76, alt);
-	_mav_put_float(buf, 80, ground_x);
-	_mav_put_float(buf, 84, ground_y);
-	_mav_put_float(buf, 88, ground_z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_AVAILABLE, buf, 92);
-#else
-	mavlink_image_available_t packet;
-	packet.cam_id = cam_id;
-	packet.cam_no = cam_no;
-	packet.timestamp = timestamp;
-	packet.valid_until = valid_until;
-	packet.img_seq = img_seq;
-	packet.img_buf_index = img_buf_index;
-	packet.width = width;
-	packet.height = height;
-	packet.depth = depth;
-	packet.channels = channels;
-	packet.key = key;
-	packet.exposure = exposure;
-	packet.gain = gain;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_AVAILABLE, (const char *)&packet, 92);
-#endif
-}
-
-#endif
-
-// MESSAGE IMAGE_AVAILABLE UNPACKING
-
-
-/**
- * @brief Get field cam_id from image_available message
- *
- * @return Camera id
- */
-static inline uint64_t mavlink_msg_image_available_get_cam_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field cam_no from image_available message
- *
- * @return Camera # (starts with 0)
- */
-static inline uint8_t mavlink_msg_image_available_get_cam_no(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field timestamp from image_available message
- *
- * @return Timestamp
- */
-static inline uint64_t mavlink_msg_image_available_get_timestamp(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  9);
-}
-
-/**
- * @brief Get field valid_until from image_available message
- *
- * @return Until which timestamp this buffer will stay valid
- */
-static inline uint64_t mavlink_msg_image_available_get_valid_until(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  17);
-}
-
-/**
- * @brief Get field img_seq from image_available message
- *
- * @return The image sequence number
- */
-static inline uint32_t mavlink_msg_image_available_get_img_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  25);
-}
-
-/**
- * @brief Get field img_buf_index from image_available message
- *
- * @return Position of the image in the buffer, starts with 0
- */
-static inline uint32_t mavlink_msg_image_available_get_img_buf_index(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  29);
-}
-
-/**
- * @brief Get field width from image_available message
- *
- * @return Image width
- */
-static inline uint16_t mavlink_msg_image_available_get_width(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  33);
-}
-
-/**
- * @brief Get field height from image_available message
- *
- * @return Image height
- */
-static inline uint16_t mavlink_msg_image_available_get_height(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  35);
-}
-
-/**
- * @brief Get field depth from image_available message
- *
- * @return Image depth
- */
-static inline uint16_t mavlink_msg_image_available_get_depth(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  37);
-}
-
-/**
- * @brief Get field channels from image_available message
- *
- * @return Image channels
- */
-static inline uint8_t mavlink_msg_image_available_get_channels(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  39);
-}
-
-/**
- * @brief Get field key from image_available message
- *
- * @return Shared memory area key
- */
-static inline uint32_t mavlink_msg_image_available_get_key(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  40);
-}
-
-/**
- * @brief Get field exposure from image_available message
- *
- * @return Exposure time, in microseconds
- */
-static inline uint32_t mavlink_msg_image_available_get_exposure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  44);
-}
-
-/**
- * @brief Get field gain from image_available message
- *
- * @return Camera gain
- */
-static inline float mavlink_msg_image_available_get_gain(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  48);
-}
-
-/**
- * @brief Get field roll from image_available message
- *
- * @return Roll angle in rad
- */
-static inline float mavlink_msg_image_available_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  52);
-}
-
-/**
- * @brief Get field pitch from image_available message
- *
- * @return Pitch angle in rad
- */
-static inline float mavlink_msg_image_available_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  56);
-}
-
-/**
- * @brief Get field yaw from image_available message
- *
- * @return Yaw angle in rad
- */
-static inline float mavlink_msg_image_available_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  60);
-}
-
-/**
- * @brief Get field local_z from image_available message
- *
- * @return Local frame Z coordinate (height over ground)
- */
-static inline float mavlink_msg_image_available_get_local_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  64);
-}
-
-/**
- * @brief Get field lat from image_available message
- *
- * @return GPS X coordinate
- */
-static inline float mavlink_msg_image_available_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  68);
-}
-
-/**
- * @brief Get field lon from image_available message
- *
- * @return GPS Y coordinate
- */
-static inline float mavlink_msg_image_available_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  72);
-}
-
-/**
- * @brief Get field alt from image_available message
- *
- * @return Global frame altitude
- */
-static inline float mavlink_msg_image_available_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  76);
-}
-
-/**
- * @brief Get field ground_x from image_available message
- *
- * @return Ground truth X
- */
-static inline float mavlink_msg_image_available_get_ground_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  80);
-}
-
-/**
- * @brief Get field ground_y from image_available message
- *
- * @return Ground truth Y
- */
-static inline float mavlink_msg_image_available_get_ground_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  84);
-}
-
-/**
- * @brief Get field ground_z from image_available message
- *
- * @return Ground truth Z
- */
-static inline float mavlink_msg_image_available_get_ground_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  88);
-}
-
-/**
- * @brief Decode a image_available message into a struct
- *
- * @param msg The message to decode
- * @param image_available C-struct to decode the message contents into
- */
-static inline void mavlink_msg_image_available_decode(const mavlink_message_t* msg, mavlink_image_available_t* image_available)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	image_available->cam_id = mavlink_msg_image_available_get_cam_id(msg);
-	image_available->cam_no = mavlink_msg_image_available_get_cam_no(msg);
-	image_available->timestamp = mavlink_msg_image_available_get_timestamp(msg);
-	image_available->valid_until = mavlink_msg_image_available_get_valid_until(msg);
-	image_available->img_seq = mavlink_msg_image_available_get_img_seq(msg);
-	image_available->img_buf_index = mavlink_msg_image_available_get_img_buf_index(msg);
-	image_available->width = mavlink_msg_image_available_get_width(msg);
-	image_available->height = mavlink_msg_image_available_get_height(msg);
-	image_available->depth = mavlink_msg_image_available_get_depth(msg);
-	image_available->channels = mavlink_msg_image_available_get_channels(msg);
-	image_available->key = mavlink_msg_image_available_get_key(msg);
-	image_available->exposure = mavlink_msg_image_available_get_exposure(msg);
-	image_available->gain = mavlink_msg_image_available_get_gain(msg);
-	image_available->roll = mavlink_msg_image_available_get_roll(msg);
-	image_available->pitch = mavlink_msg_image_available_get_pitch(msg);
-	image_available->yaw = mavlink_msg_image_available_get_yaw(msg);
-	image_available->local_z = mavlink_msg_image_available_get_local_z(msg);
-	image_available->lat = mavlink_msg_image_available_get_lat(msg);
-	image_available->lon = mavlink_msg_image_available_get_lon(msg);
-	image_available->alt = mavlink_msg_image_available_get_alt(msg);
-	image_available->ground_x = mavlink_msg_image_available_get_ground_x(msg);
-	image_available->ground_y = mavlink_msg_image_available_get_ground_y(msg);
-	image_available->ground_z = mavlink_msg_image_available_get_ground_z(msg);
-#else
-	memcpy(image_available, _MAV_PAYLOAD(msg), 92);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_trigger_control.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_trigger_control.h
deleted file mode 100644
index 36b280ec0..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_trigger_control.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// MESSAGE IMAGE_TRIGGER_CONTROL PACKING
-
-#define MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL 153
-
-typedef struct __mavlink_image_trigger_control_t
-{
- uint8_t enable; ///< 0 to disable, 1 to enable
-} mavlink_image_trigger_control_t;
-
-#define MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL_LEN 1
-#define MAVLINK_MSG_ID_153_LEN 1
-
-
-
-#define MAVLINK_MESSAGE_INFO_IMAGE_TRIGGER_CONTROL { \
-	"IMAGE_TRIGGER_CONTROL", \
-	1, \
-	{  { "enable", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_image_trigger_control_t, enable) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a image_trigger_control message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param enable 0 to disable, 1 to enable
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_trigger_control_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t enable)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, enable);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 1);
-#else
-	mavlink_image_trigger_control_t packet;
-	packet.enable = enable;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 1);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL;
-	return mavlink_finalize_message(msg, system_id, component_id, 1);
-}
-
-/**
- * @brief Pack a image_trigger_control message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param enable 0 to disable, 1 to enable
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_trigger_control_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t enable)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, enable);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 1);
-#else
-	mavlink_image_trigger_control_t packet;
-	packet.enable = enable;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 1);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 1);
-}
-
-/**
- * @brief Encode a image_trigger_control struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param image_trigger_control C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_image_trigger_control_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_image_trigger_control_t* image_trigger_control)
-{
-	return mavlink_msg_image_trigger_control_pack(system_id, component_id, msg, image_trigger_control->enable);
-}
-
-/**
- * @brief Send a image_trigger_control message
- * @param chan MAVLink channel to send the message
- *
- * @param enable 0 to disable, 1 to enable
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_image_trigger_control_send(mavlink_channel_t chan, uint8_t enable)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, enable);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, buf, 1);
-#else
-	mavlink_image_trigger_control_t packet;
-	packet.enable = enable;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, (const char *)&packet, 1);
-#endif
-}
-
-#endif
-
-// MESSAGE IMAGE_TRIGGER_CONTROL UNPACKING
-
-
-/**
- * @brief Get field enable from image_trigger_control message
- *
- * @return 0 to disable, 1 to enable
- */
-static inline uint8_t mavlink_msg_image_trigger_control_get_enable(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Decode a image_trigger_control message into a struct
- *
- * @param msg The message to decode
- * @param image_trigger_control C-struct to decode the message contents into
- */
-static inline void mavlink_msg_image_trigger_control_decode(const mavlink_message_t* msg, mavlink_image_trigger_control_t* image_trigger_control)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	image_trigger_control->enable = mavlink_msg_image_trigger_control_get_enable(msg);
-#else
-	memcpy(image_trigger_control, _MAV_PAYLOAD(msg), 1);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_triggered.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_triggered.h
deleted file mode 100644
index a40bc134b..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_triggered.h
+++ /dev/null
@@ -1,386 +0,0 @@
-// MESSAGE IMAGE_TRIGGERED PACKING
-
-#define MAVLINK_MSG_ID_IMAGE_TRIGGERED 152
-
-typedef struct __mavlink_image_triggered_t
-{
- uint64_t timestamp; ///< Timestamp
- uint32_t seq; ///< IMU seq
- float roll; ///< Roll angle in rad
- float pitch; ///< Pitch angle in rad
- float yaw; ///< Yaw angle in rad
- float local_z; ///< Local frame Z coordinate (height over ground)
- float lat; ///< GPS X coordinate
- float lon; ///< GPS Y coordinate
- float alt; ///< Global frame altitude
- float ground_x; ///< Ground truth X
- float ground_y; ///< Ground truth Y
- float ground_z; ///< Ground truth Z
-} mavlink_image_triggered_t;
-
-#define MAVLINK_MSG_ID_IMAGE_TRIGGERED_LEN 52
-#define MAVLINK_MSG_ID_152_LEN 52
-
-
-
-#define MAVLINK_MESSAGE_INFO_IMAGE_TRIGGERED { \
-	"IMAGE_TRIGGERED", \
-	12, \
-	{  { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_image_triggered_t, timestamp) }, \
-         { "seq", NULL, MAVLINK_TYPE_UINT32_T, 0, 8, offsetof(mavlink_image_triggered_t, seq) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_image_triggered_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_image_triggered_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_image_triggered_t, yaw) }, \
-         { "local_z", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_image_triggered_t, local_z) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_image_triggered_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_image_triggered_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_image_triggered_t, alt) }, \
-         { "ground_x", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_image_triggered_t, ground_x) }, \
-         { "ground_y", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_image_triggered_t, ground_y) }, \
-         { "ground_z", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_image_triggered_t, ground_z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a image_triggered message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param timestamp Timestamp
- * @param seq IMU seq
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_triggered_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t timestamp, uint32_t seq, float roll, float pitch, float yaw, float local_z, float lat, float lon, float alt, float ground_x, float ground_y, float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[52];
-	_mav_put_uint64_t(buf, 0, timestamp);
-	_mav_put_uint32_t(buf, 8, seq);
-	_mav_put_float(buf, 12, roll);
-	_mav_put_float(buf, 16, pitch);
-	_mav_put_float(buf, 20, yaw);
-	_mav_put_float(buf, 24, local_z);
-	_mav_put_float(buf, 28, lat);
-	_mav_put_float(buf, 32, lon);
-	_mav_put_float(buf, 36, alt);
-	_mav_put_float(buf, 40, ground_x);
-	_mav_put_float(buf, 44, ground_y);
-	_mav_put_float(buf, 48, ground_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 52);
-#else
-	mavlink_image_triggered_t packet;
-	packet.timestamp = timestamp;
-	packet.seq = seq;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 52);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGERED;
-	return mavlink_finalize_message(msg, system_id, component_id, 52);
-}
-
-/**
- * @brief Pack a image_triggered message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param timestamp Timestamp
- * @param seq IMU seq
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_image_triggered_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t timestamp,uint32_t seq,float roll,float pitch,float yaw,float local_z,float lat,float lon,float alt,float ground_x,float ground_y,float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[52];
-	_mav_put_uint64_t(buf, 0, timestamp);
-	_mav_put_uint32_t(buf, 8, seq);
-	_mav_put_float(buf, 12, roll);
-	_mav_put_float(buf, 16, pitch);
-	_mav_put_float(buf, 20, yaw);
-	_mav_put_float(buf, 24, local_z);
-	_mav_put_float(buf, 28, lat);
-	_mav_put_float(buf, 32, lon);
-	_mav_put_float(buf, 36, alt);
-	_mav_put_float(buf, 40, ground_x);
-	_mav_put_float(buf, 44, ground_y);
-	_mav_put_float(buf, 48, ground_z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 52);
-#else
-	mavlink_image_triggered_t packet;
-	packet.timestamp = timestamp;
-	packet.seq = seq;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 52);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGERED;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 52);
-}
-
-/**
- * @brief Encode a image_triggered struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param image_triggered C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_image_triggered_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_image_triggered_t* image_triggered)
-{
-	return mavlink_msg_image_triggered_pack(system_id, component_id, msg, image_triggered->timestamp, image_triggered->seq, image_triggered->roll, image_triggered->pitch, image_triggered->yaw, image_triggered->local_z, image_triggered->lat, image_triggered->lon, image_triggered->alt, image_triggered->ground_x, image_triggered->ground_y, image_triggered->ground_z);
-}
-
-/**
- * @brief Send a image_triggered message
- * @param chan MAVLink channel to send the message
- *
- * @param timestamp Timestamp
- * @param seq IMU seq
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @param local_z Local frame Z coordinate (height over ground)
- * @param lat GPS X coordinate
- * @param lon GPS Y coordinate
- * @param alt Global frame altitude
- * @param ground_x Ground truth X
- * @param ground_y Ground truth Y
- * @param ground_z Ground truth Z
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_image_triggered_send(mavlink_channel_t chan, uint64_t timestamp, uint32_t seq, float roll, float pitch, float yaw, float local_z, float lat, float lon, float alt, float ground_x, float ground_y, float ground_z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[52];
-	_mav_put_uint64_t(buf, 0, timestamp);
-	_mav_put_uint32_t(buf, 8, seq);
-	_mav_put_float(buf, 12, roll);
-	_mav_put_float(buf, 16, pitch);
-	_mav_put_float(buf, 20, yaw);
-	_mav_put_float(buf, 24, local_z);
-	_mav_put_float(buf, 28, lat);
-	_mav_put_float(buf, 32, lon);
-	_mav_put_float(buf, 36, alt);
-	_mav_put_float(buf, 40, ground_x);
-	_mav_put_float(buf, 44, ground_y);
-	_mav_put_float(buf, 48, ground_z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, buf, 52);
-#else
-	mavlink_image_triggered_t packet;
-	packet.timestamp = timestamp;
-	packet.seq = seq;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-	packet.local_z = local_z;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.ground_x = ground_x;
-	packet.ground_y = ground_y;
-	packet.ground_z = ground_z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, (const char *)&packet, 52);
-#endif
-}
-
-#endif
-
-// MESSAGE IMAGE_TRIGGERED UNPACKING
-
-
-/**
- * @brief Get field timestamp from image_triggered message
- *
- * @return Timestamp
- */
-static inline uint64_t mavlink_msg_image_triggered_get_timestamp(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field seq from image_triggered message
- *
- * @return IMU seq
- */
-static inline uint32_t mavlink_msg_image_triggered_get_seq(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  8);
-}
-
-/**
- * @brief Get field roll from image_triggered message
- *
- * @return Roll angle in rad
- */
-static inline float mavlink_msg_image_triggered_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field pitch from image_triggered message
- *
- * @return Pitch angle in rad
- */
-static inline float mavlink_msg_image_triggered_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field yaw from image_triggered message
- *
- * @return Yaw angle in rad
- */
-static inline float mavlink_msg_image_triggered_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field local_z from image_triggered message
- *
- * @return Local frame Z coordinate (height over ground)
- */
-static inline float mavlink_msg_image_triggered_get_local_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field lat from image_triggered message
- *
- * @return GPS X coordinate
- */
-static inline float mavlink_msg_image_triggered_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field lon from image_triggered message
- *
- * @return GPS Y coordinate
- */
-static inline float mavlink_msg_image_triggered_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Get field alt from image_triggered message
- *
- * @return Global frame altitude
- */
-static inline float mavlink_msg_image_triggered_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  36);
-}
-
-/**
- * @brief Get field ground_x from image_triggered message
- *
- * @return Ground truth X
- */
-static inline float mavlink_msg_image_triggered_get_ground_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  40);
-}
-
-/**
- * @brief Get field ground_y from image_triggered message
- *
- * @return Ground truth Y
- */
-static inline float mavlink_msg_image_triggered_get_ground_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  44);
-}
-
-/**
- * @brief Get field ground_z from image_triggered message
- *
- * @return Ground truth Z
- */
-static inline float mavlink_msg_image_triggered_get_ground_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  48);
-}
-
-/**
- * @brief Decode a image_triggered message into a struct
- *
- * @param msg The message to decode
- * @param image_triggered C-struct to decode the message contents into
- */
-static inline void mavlink_msg_image_triggered_decode(const mavlink_message_t* msg, mavlink_image_triggered_t* image_triggered)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	image_triggered->timestamp = mavlink_msg_image_triggered_get_timestamp(msg);
-	image_triggered->seq = mavlink_msg_image_triggered_get_seq(msg);
-	image_triggered->roll = mavlink_msg_image_triggered_get_roll(msg);
-	image_triggered->pitch = mavlink_msg_image_triggered_get_pitch(msg);
-	image_triggered->yaw = mavlink_msg_image_triggered_get_yaw(msg);
-	image_triggered->local_z = mavlink_msg_image_triggered_get_local_z(msg);
-	image_triggered->lat = mavlink_msg_image_triggered_get_lat(msg);
-	image_triggered->lon = mavlink_msg_image_triggered_get_lon(msg);
-	image_triggered->alt = mavlink_msg_image_triggered_get_alt(msg);
-	image_triggered->ground_x = mavlink_msg_image_triggered_get_ground_x(msg);
-	image_triggered->ground_y = mavlink_msg_image_triggered_get_ground_y(msg);
-	image_triggered->ground_z = mavlink_msg_image_triggered_get_ground_z(msg);
-#else
-	memcpy(image_triggered, _MAV_PAYLOAD(msg), 52);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_marker.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_marker.h
deleted file mode 100644
index f5d20dd04..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_marker.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE MARKER PACKING
-
-#define MAVLINK_MSG_ID_MARKER 171
-
-typedef struct __mavlink_marker_t
-{
- uint16_t id; ///< ID
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float roll; ///< roll orientation
- float pitch; ///< pitch orientation
- float yaw; ///< yaw orientation
-} mavlink_marker_t;
-
-#define MAVLINK_MSG_ID_MARKER_LEN 26
-#define MAVLINK_MSG_ID_171_LEN 26
-
-
-
-#define MAVLINK_MESSAGE_INFO_MARKER { \
-	"MARKER", \
-	7, \
-	{  { "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_marker_t, id) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_marker_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_marker_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_marker_t, z) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_marker_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 18, offsetof(mavlink_marker_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 22, offsetof(mavlink_marker_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a marker message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param id ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param roll roll orientation
- * @param pitch pitch orientation
- * @param yaw yaw orientation
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_marker_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t id, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, roll);
-	_mav_put_float(buf, 18, pitch);
-	_mav_put_float(buf, 22, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_marker_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MARKER;
-	return mavlink_finalize_message(msg, system_id, component_id, 26);
-}
-
-/**
- * @brief Pack a marker message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param id ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param roll roll orientation
- * @param pitch pitch orientation
- * @param yaw yaw orientation
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_marker_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t id,float x,float y,float z,float roll,float pitch,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, roll);
-	_mav_put_float(buf, 18, pitch);
-	_mav_put_float(buf, 22, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
-#else
-	mavlink_marker_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MARKER;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
-}
-
-/**
- * @brief Encode a marker struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param marker C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_marker_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_marker_t* marker)
-{
-	return mavlink_msg_marker_pack(system_id, component_id, msg, marker->id, marker->x, marker->y, marker->z, marker->roll, marker->pitch, marker->yaw);
-}
-
-/**
- * @brief Send a marker message
- * @param chan MAVLink channel to send the message
- *
- * @param id ID
- * @param x x position
- * @param y y position
- * @param z z position
- * @param roll roll orientation
- * @param pitch pitch orientation
- * @param yaw yaw orientation
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_marker_send(mavlink_channel_t chan, uint16_t id, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[26];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, roll);
-	_mav_put_float(buf, 18, pitch);
-	_mav_put_float(buf, 22, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, buf, 26);
-#else
-	mavlink_marker_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, (const char *)&packet, 26);
-#endif
-}
-
-#endif
-
-// MESSAGE MARKER UNPACKING
-
-
-/**
- * @brief Get field id from marker message
- *
- * @return ID
- */
-static inline uint16_t mavlink_msg_marker_get_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field x from marker message
- *
- * @return x position
- */
-static inline float mavlink_msg_marker_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field y from marker message
- *
- * @return y position
- */
-static inline float mavlink_msg_marker_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field z from marker message
- *
- * @return z position
- */
-static inline float mavlink_msg_marker_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field roll from marker message
- *
- * @return roll orientation
- */
-static inline float mavlink_msg_marker_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Get field pitch from marker message
- *
- * @return pitch orientation
- */
-static inline float mavlink_msg_marker_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  18);
-}
-
-/**
- * @brief Get field yaw from marker message
- *
- * @return yaw orientation
- */
-static inline float mavlink_msg_marker_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  22);
-}
-
-/**
- * @brief Decode a marker message into a struct
- *
- * @param msg The message to decode
- * @param marker C-struct to decode the message contents into
- */
-static inline void mavlink_msg_marker_decode(const mavlink_message_t* msg, mavlink_marker_t* marker)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	marker->id = mavlink_msg_marker_get_id(msg);
-	marker->x = mavlink_msg_marker_get_x(msg);
-	marker->y = mavlink_msg_marker_get_y(msg);
-	marker->z = mavlink_msg_marker_get_z(msg);
-	marker->roll = mavlink_msg_marker_get_roll(msg);
-	marker->pitch = mavlink_msg_marker_get_pitch(msg);
-	marker->yaw = mavlink_msg_marker_get_yaw(msg);
-#else
-	memcpy(marker, _MAV_PAYLOAD(msg), 26);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_pattern_detected.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_pattern_detected.h
deleted file mode 100644
index a5aabe9f9..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_pattern_detected.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// MESSAGE PATTERN_DETECTED PACKING
-
-#define MAVLINK_MSG_ID_PATTERN_DETECTED 190
-
-typedef struct __mavlink_pattern_detected_t
-{
- uint8_t type; ///< 0: Pattern, 1: Letter
- float confidence; ///< Confidence of detection
- char file[100]; ///< Pattern file name
- uint8_t detected; ///< Accepted as true detection, 0 no, 1 yes
-} mavlink_pattern_detected_t;
-
-#define MAVLINK_MSG_ID_PATTERN_DETECTED_LEN 106
-#define MAVLINK_MSG_ID_190_LEN 106
-
-#define MAVLINK_MSG_PATTERN_DETECTED_FIELD_FILE_LEN 100
-
-#define MAVLINK_MESSAGE_INFO_PATTERN_DETECTED { \
-	"PATTERN_DETECTED", \
-	4, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_pattern_detected_t, type) }, \
-         { "confidence", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_pattern_detected_t, confidence) }, \
-         { "file", NULL, MAVLINK_TYPE_CHAR, 100, 5, offsetof(mavlink_pattern_detected_t, file) }, \
-         { "detected", NULL, MAVLINK_TYPE_UINT8_T, 0, 105, offsetof(mavlink_pattern_detected_t, detected) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a pattern_detected message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type 0: Pattern, 1: Letter
- * @param confidence Confidence of detection
- * @param file Pattern file name
- * @param detected Accepted as true detection, 0 no, 1 yes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_pattern_detected_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, float confidence, const char *file, uint8_t detected)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[106];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_float(buf, 1, confidence);
-	_mav_put_uint8_t(buf, 105, detected);
-	_mav_put_char_array(buf, 5, file, 100);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 106);
-#else
-	mavlink_pattern_detected_t packet;
-	packet.type = type;
-	packet.confidence = confidence;
-	packet.detected = detected;
-	mav_array_memcpy(packet.file, file, sizeof(char)*100);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 106);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PATTERN_DETECTED;
-	return mavlink_finalize_message(msg, system_id, component_id, 106);
-}
-
-/**
- * @brief Pack a pattern_detected message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type 0: Pattern, 1: Letter
- * @param confidence Confidence of detection
- * @param file Pattern file name
- * @param detected Accepted as true detection, 0 no, 1 yes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_pattern_detected_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,float confidence,const char *file,uint8_t detected)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[106];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_float(buf, 1, confidence);
-	_mav_put_uint8_t(buf, 105, detected);
-	_mav_put_char_array(buf, 5, file, 100);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 106);
-#else
-	mavlink_pattern_detected_t packet;
-	packet.type = type;
-	packet.confidence = confidence;
-	packet.detected = detected;
-	mav_array_memcpy(packet.file, file, sizeof(char)*100);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 106);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_PATTERN_DETECTED;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 106);
-}
-
-/**
- * @brief Encode a pattern_detected struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param pattern_detected C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_pattern_detected_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_pattern_detected_t* pattern_detected)
-{
-	return mavlink_msg_pattern_detected_pack(system_id, component_id, msg, pattern_detected->type, pattern_detected->confidence, pattern_detected->file, pattern_detected->detected);
-}
-
-/**
- * @brief Send a pattern_detected message
- * @param chan MAVLink channel to send the message
- *
- * @param type 0: Pattern, 1: Letter
- * @param confidence Confidence of detection
- * @param file Pattern file name
- * @param detected Accepted as true detection, 0 no, 1 yes
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_pattern_detected_send(mavlink_channel_t chan, uint8_t type, float confidence, const char *file, uint8_t detected)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[106];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_float(buf, 1, confidence);
-	_mav_put_uint8_t(buf, 105, detected);
-	_mav_put_char_array(buf, 5, file, 100);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, buf, 106);
-#else
-	mavlink_pattern_detected_t packet;
-	packet.type = type;
-	packet.confidence = confidence;
-	packet.detected = detected;
-	mav_array_memcpy(packet.file, file, sizeof(char)*100);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, (const char *)&packet, 106);
-#endif
-}
-
-#endif
-
-// MESSAGE PATTERN_DETECTED UNPACKING
-
-
-/**
- * @brief Get field type from pattern_detected message
- *
- * @return 0: Pattern, 1: Letter
- */
-static inline uint8_t mavlink_msg_pattern_detected_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field confidence from pattern_detected message
- *
- * @return Confidence of detection
- */
-static inline float mavlink_msg_pattern_detected_get_confidence(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Get field file from pattern_detected message
- *
- * @return Pattern file name
- */
-static inline uint16_t mavlink_msg_pattern_detected_get_file(const mavlink_message_t* msg, char *file)
-{
-	return _MAV_RETURN_char_array(msg, file, 100,  5);
-}
-
-/**
- * @brief Get field detected from pattern_detected message
- *
- * @return Accepted as true detection, 0 no, 1 yes
- */
-static inline uint8_t mavlink_msg_pattern_detected_get_detected(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  105);
-}
-
-/**
- * @brief Decode a pattern_detected message into a struct
- *
- * @param msg The message to decode
- * @param pattern_detected C-struct to decode the message contents into
- */
-static inline void mavlink_msg_pattern_detected_decode(const mavlink_message_t* msg, mavlink_pattern_detected_t* pattern_detected)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	pattern_detected->type = mavlink_msg_pattern_detected_get_type(msg);
-	pattern_detected->confidence = mavlink_msg_pattern_detected_get_confidence(msg);
-	mavlink_msg_pattern_detected_get_file(msg, pattern_detected->file);
-	pattern_detected->detected = mavlink_msg_pattern_detected_get_detected(msg);
-#else
-	memcpy(pattern_detected, _MAV_PAYLOAD(msg), 106);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest.h
deleted file mode 100644
index 008ed436e..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest.h
+++ /dev/null
@@ -1,292 +0,0 @@
-// MESSAGE POINT_OF_INTEREST PACKING
-
-#define MAVLINK_MSG_ID_POINT_OF_INTEREST 191
-
-typedef struct __mavlink_point_of_interest_t
-{
- uint8_t type; ///< 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- uint8_t color; ///< 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- uint8_t coordinate_system; ///< 0: global, 1:local
- uint16_t timeout; ///< 0: no timeout, >1: timeout in seconds
- float x; ///< X Position
- float y; ///< Y Position
- float z; ///< Z Position
- char name[26]; ///< POI name
-} mavlink_point_of_interest_t;
-
-#define MAVLINK_MSG_ID_POINT_OF_INTEREST_LEN 43
-#define MAVLINK_MSG_ID_191_LEN 43
-
-#define MAVLINK_MSG_POINT_OF_INTEREST_FIELD_NAME_LEN 26
-
-#define MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST { \
-	"POINT_OF_INTEREST", \
-	8, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_point_of_interest_t, type) }, \
-         { "color", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_point_of_interest_t, color) }, \
-         { "coordinate_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_point_of_interest_t, coordinate_system) }, \
-         { "timeout", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_point_of_interest_t, timeout) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_point_of_interest_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_point_of_interest_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_point_of_interest_t, z) }, \
-         { "name", NULL, MAVLINK_TYPE_CHAR, 26, 17, offsetof(mavlink_point_of_interest_t, name) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a point_of_interest message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param name POI name
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_point_of_interest_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint8_t color, uint8_t coordinate_system, uint16_t timeout, float x, float y, float z, const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[43];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, x);
-	_mav_put_float(buf, 9, y);
-	_mav_put_float(buf, 13, z);
-	_mav_put_char_array(buf, 17, name, 26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 43);
-#else
-	mavlink_point_of_interest_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 43);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST;
-	return mavlink_finalize_message(msg, system_id, component_id, 43);
-}
-
-/**
- * @brief Pack a point_of_interest message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param name POI name
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_point_of_interest_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint8_t color,uint8_t coordinate_system,uint16_t timeout,float x,float y,float z,const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[43];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, x);
-	_mav_put_float(buf, 9, y);
-	_mav_put_float(buf, 13, z);
-	_mav_put_char_array(buf, 17, name, 26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 43);
-#else
-	mavlink_point_of_interest_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 43);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 43);
-}
-
-/**
- * @brief Encode a point_of_interest struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param point_of_interest C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_point_of_interest_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_point_of_interest_t* point_of_interest)
-{
-	return mavlink_msg_point_of_interest_pack(system_id, component_id, msg, point_of_interest->type, point_of_interest->color, point_of_interest->coordinate_system, point_of_interest->timeout, point_of_interest->x, point_of_interest->y, point_of_interest->z, point_of_interest->name);
-}
-
-/**
- * @brief Send a point_of_interest message
- * @param chan MAVLink channel to send the message
- *
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param name POI name
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_point_of_interest_send(mavlink_channel_t chan, uint8_t type, uint8_t color, uint8_t coordinate_system, uint16_t timeout, float x, float y, float z, const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[43];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, x);
-	_mav_put_float(buf, 9, y);
-	_mav_put_float(buf, 13, z);
-	_mav_put_char_array(buf, 17, name, 26);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, buf, 43);
-#else
-	mavlink_point_of_interest_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, (const char *)&packet, 43);
-#endif
-}
-
-#endif
-
-// MESSAGE POINT_OF_INTEREST UNPACKING
-
-
-/**
- * @brief Get field type from point_of_interest message
- *
- * @return 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- */
-static inline uint8_t mavlink_msg_point_of_interest_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field color from point_of_interest message
- *
- * @return 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- */
-static inline uint8_t mavlink_msg_point_of_interest_get_color(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field coordinate_system from point_of_interest message
- *
- * @return 0: global, 1:local
- */
-static inline uint8_t mavlink_msg_point_of_interest_get_coordinate_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field timeout from point_of_interest message
- *
- * @return 0: no timeout, >1: timeout in seconds
- */
-static inline uint16_t mavlink_msg_point_of_interest_get_timeout(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field x from point_of_interest message
- *
- * @return X Position
- */
-static inline float mavlink_msg_point_of_interest_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field y from point_of_interest message
- *
- * @return Y Position
- */
-static inline float mavlink_msg_point_of_interest_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field z from point_of_interest message
- *
- * @return Z Position
- */
-static inline float mavlink_msg_point_of_interest_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field name from point_of_interest message
- *
- * @return POI name
- */
-static inline uint16_t mavlink_msg_point_of_interest_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 26,  17);
-}
-
-/**
- * @brief Decode a point_of_interest message into a struct
- *
- * @param msg The message to decode
- * @param point_of_interest C-struct to decode the message contents into
- */
-static inline void mavlink_msg_point_of_interest_decode(const mavlink_message_t* msg, mavlink_point_of_interest_t* point_of_interest)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	point_of_interest->type = mavlink_msg_point_of_interest_get_type(msg);
-	point_of_interest->color = mavlink_msg_point_of_interest_get_color(msg);
-	point_of_interest->coordinate_system = mavlink_msg_point_of_interest_get_coordinate_system(msg);
-	point_of_interest->timeout = mavlink_msg_point_of_interest_get_timeout(msg);
-	point_of_interest->x = mavlink_msg_point_of_interest_get_x(msg);
-	point_of_interest->y = mavlink_msg_point_of_interest_get_y(msg);
-	point_of_interest->z = mavlink_msg_point_of_interest_get_z(msg);
-	mavlink_msg_point_of_interest_get_name(msg, point_of_interest->name);
-#else
-	memcpy(point_of_interest, _MAV_PAYLOAD(msg), 43);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest_connection.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest_connection.h
deleted file mode 100644
index d8de738c7..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest_connection.h
+++ /dev/null
@@ -1,358 +0,0 @@
-// MESSAGE POINT_OF_INTEREST_CONNECTION PACKING
-
-#define MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION 192
-
-typedef struct __mavlink_point_of_interest_connection_t
-{
- uint8_t type; ///< 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- uint8_t color; ///< 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- uint8_t coordinate_system; ///< 0: global, 1:local
- uint16_t timeout; ///< 0: no timeout, >1: timeout in seconds
- float xp1; ///< X1 Position
- float yp1; ///< Y1 Position
- float zp1; ///< Z1 Position
- float xp2; ///< X2 Position
- float yp2; ///< Y2 Position
- float zp2; ///< Z2 Position
- char name[26]; ///< POI connection name
-} mavlink_point_of_interest_connection_t;
-
-#define MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION_LEN 55
-#define MAVLINK_MSG_ID_192_LEN 55
-
-#define MAVLINK_MSG_POINT_OF_INTEREST_CONNECTION_FIELD_NAME_LEN 26
-
-#define MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST_CONNECTION { \
-	"POINT_OF_INTEREST_CONNECTION", \
-	11, \
-	{  { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_point_of_interest_connection_t, type) }, \
-         { "color", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_point_of_interest_connection_t, color) }, \
-         { "coordinate_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_point_of_interest_connection_t, coordinate_system) }, \
-         { "timeout", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_point_of_interest_connection_t, timeout) }, \
-         { "xp1", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_point_of_interest_connection_t, xp1) }, \
-         { "yp1", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_point_of_interest_connection_t, yp1) }, \
-         { "zp1", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_point_of_interest_connection_t, zp1) }, \
-         { "xp2", NULL, MAVLINK_TYPE_FLOAT, 0, 17, offsetof(mavlink_point_of_interest_connection_t, xp2) }, \
-         { "yp2", NULL, MAVLINK_TYPE_FLOAT, 0, 21, offsetof(mavlink_point_of_interest_connection_t, yp2) }, \
-         { "zp2", NULL, MAVLINK_TYPE_FLOAT, 0, 25, offsetof(mavlink_point_of_interest_connection_t, zp2) }, \
-         { "name", NULL, MAVLINK_TYPE_CHAR, 26, 29, offsetof(mavlink_point_of_interest_connection_t, name) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a point_of_interest_connection message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param xp1 X1 Position
- * @param yp1 Y1 Position
- * @param zp1 Z1 Position
- * @param xp2 X2 Position
- * @param yp2 Y2 Position
- * @param zp2 Z2 Position
- * @param name POI connection name
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_point_of_interest_connection_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint8_t color, uint8_t coordinate_system, uint16_t timeout, float xp1, float yp1, float zp1, float xp2, float yp2, float zp2, const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[55];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, xp1);
-	_mav_put_float(buf, 9, yp1);
-	_mav_put_float(buf, 13, zp1);
-	_mav_put_float(buf, 17, xp2);
-	_mav_put_float(buf, 21, yp2);
-	_mav_put_float(buf, 25, zp2);
-	_mav_put_char_array(buf, 29, name, 26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 55);
-#else
-	mavlink_point_of_interest_connection_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.xp1 = xp1;
-	packet.yp1 = yp1;
-	packet.zp1 = zp1;
-	packet.xp2 = xp2;
-	packet.yp2 = yp2;
-	packet.zp2 = zp2;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 55);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 55);
-}
-
-/**
- * @brief Pack a point_of_interest_connection message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param xp1 X1 Position
- * @param yp1 Y1 Position
- * @param zp1 Z1 Position
- * @param xp2 X2 Position
- * @param yp2 Y2 Position
- * @param zp2 Z2 Position
- * @param name POI connection name
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_point_of_interest_connection_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint8_t color,uint8_t coordinate_system,uint16_t timeout,float xp1,float yp1,float zp1,float xp2,float yp2,float zp2,const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[55];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, xp1);
-	_mav_put_float(buf, 9, yp1);
-	_mav_put_float(buf, 13, zp1);
-	_mav_put_float(buf, 17, xp2);
-	_mav_put_float(buf, 21, yp2);
-	_mav_put_float(buf, 25, zp2);
-	_mav_put_char_array(buf, 29, name, 26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 55);
-#else
-	mavlink_point_of_interest_connection_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.xp1 = xp1;
-	packet.yp1 = yp1;
-	packet.zp1 = zp1;
-	packet.xp2 = xp2;
-	packet.yp2 = yp2;
-	packet.zp2 = zp2;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 55);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 55);
-}
-
-/**
- * @brief Encode a point_of_interest_connection struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param point_of_interest_connection C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_point_of_interest_connection_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_point_of_interest_connection_t* point_of_interest_connection)
-{
-	return mavlink_msg_point_of_interest_connection_pack(system_id, component_id, msg, point_of_interest_connection->type, point_of_interest_connection->color, point_of_interest_connection->coordinate_system, point_of_interest_connection->timeout, point_of_interest_connection->xp1, point_of_interest_connection->yp1, point_of_interest_connection->zp1, point_of_interest_connection->xp2, point_of_interest_connection->yp2, point_of_interest_connection->zp2, point_of_interest_connection->name);
-}
-
-/**
- * @brief Send a point_of_interest_connection message
- * @param chan MAVLink channel to send the message
- *
- * @param type 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- * @param color 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- * @param coordinate_system 0: global, 1:local
- * @param timeout 0: no timeout, >1: timeout in seconds
- * @param xp1 X1 Position
- * @param yp1 Y1 Position
- * @param zp1 Z1 Position
- * @param xp2 X2 Position
- * @param yp2 Y2 Position
- * @param zp2 Z2 Position
- * @param name POI connection name
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_point_of_interest_connection_send(mavlink_channel_t chan, uint8_t type, uint8_t color, uint8_t coordinate_system, uint16_t timeout, float xp1, float yp1, float zp1, float xp2, float yp2, float zp2, const char *name)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[55];
-	_mav_put_uint8_t(buf, 0, type);
-	_mav_put_uint8_t(buf, 1, color);
-	_mav_put_uint8_t(buf, 2, coordinate_system);
-	_mav_put_uint16_t(buf, 3, timeout);
-	_mav_put_float(buf, 5, xp1);
-	_mav_put_float(buf, 9, yp1);
-	_mav_put_float(buf, 13, zp1);
-	_mav_put_float(buf, 17, xp2);
-	_mav_put_float(buf, 21, yp2);
-	_mav_put_float(buf, 25, zp2);
-	_mav_put_char_array(buf, 29, name, 26);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION, buf, 55);
-#else
-	mavlink_point_of_interest_connection_t packet;
-	packet.type = type;
-	packet.color = color;
-	packet.coordinate_system = coordinate_system;
-	packet.timeout = timeout;
-	packet.xp1 = xp1;
-	packet.yp1 = yp1;
-	packet.zp1 = zp1;
-	packet.xp2 = xp2;
-	packet.yp2 = yp2;
-	packet.zp2 = zp2;
-	mav_array_memcpy(packet.name, name, sizeof(char)*26);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION, (const char *)&packet, 55);
-#endif
-}
-
-#endif
-
-// MESSAGE POINT_OF_INTEREST_CONNECTION UNPACKING
-
-
-/**
- * @brief Get field type from point_of_interest_connection message
- *
- * @return 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
- */
-static inline uint8_t mavlink_msg_point_of_interest_connection_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field color from point_of_interest_connection message
- *
- * @return 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
- */
-static inline uint8_t mavlink_msg_point_of_interest_connection_get_color(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field coordinate_system from point_of_interest_connection message
- *
- * @return 0: global, 1:local
- */
-static inline uint8_t mavlink_msg_point_of_interest_connection_get_coordinate_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field timeout from point_of_interest_connection message
- *
- * @return 0: no timeout, >1: timeout in seconds
- */
-static inline uint16_t mavlink_msg_point_of_interest_connection_get_timeout(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field xp1 from point_of_interest_connection message
- *
- * @return X1 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_xp1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field yp1 from point_of_interest_connection message
- *
- * @return Y1 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_yp1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Get field zp1 from point_of_interest_connection message
- *
- * @return Z1 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_zp1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  13);
-}
-
-/**
- * @brief Get field xp2 from point_of_interest_connection message
- *
- * @return X2 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_xp2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  17);
-}
-
-/**
- * @brief Get field yp2 from point_of_interest_connection message
- *
- * @return Y2 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_yp2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  21);
-}
-
-/**
- * @brief Get field zp2 from point_of_interest_connection message
- *
- * @return Z2 Position
- */
-static inline float mavlink_msg_point_of_interest_connection_get_zp2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  25);
-}
-
-/**
- * @brief Get field name from point_of_interest_connection message
- *
- * @return POI connection name
- */
-static inline uint16_t mavlink_msg_point_of_interest_connection_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 26,  29);
-}
-
-/**
- * @brief Decode a point_of_interest_connection message into a struct
- *
- * @param msg The message to decode
- * @param point_of_interest_connection C-struct to decode the message contents into
- */
-static inline void mavlink_msg_point_of_interest_connection_decode(const mavlink_message_t* msg, mavlink_point_of_interest_connection_t* point_of_interest_connection)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	point_of_interest_connection->type = mavlink_msg_point_of_interest_connection_get_type(msg);
-	point_of_interest_connection->color = mavlink_msg_point_of_interest_connection_get_color(msg);
-	point_of_interest_connection->coordinate_system = mavlink_msg_point_of_interest_connection_get_coordinate_system(msg);
-	point_of_interest_connection->timeout = mavlink_msg_point_of_interest_connection_get_timeout(msg);
-	point_of_interest_connection->xp1 = mavlink_msg_point_of_interest_connection_get_xp1(msg);
-	point_of_interest_connection->yp1 = mavlink_msg_point_of_interest_connection_get_yp1(msg);
-	point_of_interest_connection->zp1 = mavlink_msg_point_of_interest_connection_get_zp1(msg);
-	point_of_interest_connection->xp2 = mavlink_msg_point_of_interest_connection_get_xp2(msg);
-	point_of_interest_connection->yp2 = mavlink_msg_point_of_interest_connection_get_yp2(msg);
-	point_of_interest_connection->zp2 = mavlink_msg_point_of_interest_connection_get_zp2(msg);
-	mavlink_msg_point_of_interest_connection_get_name(msg, point_of_interest_connection->name);
-#else
-	memcpy(point_of_interest_connection, _MAV_PAYLOAD(msg), 55);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_offset_set.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_offset_set.h
deleted file mode 100644
index 1591b6abe..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_offset_set.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE POSITION_CONTROL_OFFSET_SET PACKING
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET 160
-
-typedef struct __mavlink_position_control_offset_set_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- float x; ///< x position offset
- float y; ///< y position offset
- float z; ///< z position offset
- float yaw; ///< yaw orientation offset in radians, 0 = NORTH
-} mavlink_position_control_offset_set_t;
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET_LEN 18
-#define MAVLINK_MSG_ID_160_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_POSITION_CONTROL_OFFSET_SET { \
-	"POSITION_CONTROL_OFFSET_SET", \
-	6, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_position_control_offset_set_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_position_control_offset_set_t, target_component) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_position_control_offset_set_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_position_control_offset_set_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_position_control_offset_set_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_position_control_offset_set_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a position_control_offset_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position offset
- * @param y y position offset
- * @param z z position offset
- * @param yaw yaw orientation offset in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_offset_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_position_control_offset_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a position_control_offset_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position offset
- * @param y y position offset
- * @param z z position offset
- * @param yaw yaw orientation offset in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_offset_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_position_control_offset_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a position_control_offset_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param position_control_offset_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_position_control_offset_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_position_control_offset_set_t* position_control_offset_set)
-{
-	return mavlink_msg_position_control_offset_set_pack(system_id, component_id, msg, position_control_offset_set->target_system, position_control_offset_set->target_component, position_control_offset_set->x, position_control_offset_set->y, position_control_offset_set->z, position_control_offset_set->yaw);
-}
-
-/**
- * @brief Send a position_control_offset_set message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param x x position offset
- * @param y y position offset
- * @param z z position offset
- * @param yaw yaw orientation offset in radians, 0 = NORTH
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_position_control_offset_set_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET, buf, 18);
-#else
-	mavlink_position_control_offset_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_OFFSET_SET, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE POSITION_CONTROL_OFFSET_SET UNPACKING
-
-
-/**
- * @brief Get field target_system from position_control_offset_set message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_position_control_offset_set_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from position_control_offset_set message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_position_control_offset_set_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field x from position_control_offset_set message
- *
- * @return x position offset
- */
-static inline float mavlink_msg_position_control_offset_set_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field y from position_control_offset_set message
- *
- * @return y position offset
- */
-static inline float mavlink_msg_position_control_offset_set_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field z from position_control_offset_set message
- *
- * @return z position offset
- */
-static inline float mavlink_msg_position_control_offset_set_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field yaw from position_control_offset_set message
- *
- * @return yaw orientation offset in radians, 0 = NORTH
- */
-static inline float mavlink_msg_position_control_offset_set_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a position_control_offset_set message into a struct
- *
- * @param msg The message to decode
- * @param position_control_offset_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_position_control_offset_set_decode(const mavlink_message_t* msg, mavlink_position_control_offset_set_t* position_control_offset_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	position_control_offset_set->target_system = mavlink_msg_position_control_offset_set_get_target_system(msg);
-	position_control_offset_set->target_component = mavlink_msg_position_control_offset_set_get_target_component(msg);
-	position_control_offset_set->x = mavlink_msg_position_control_offset_set_get_x(msg);
-	position_control_offset_set->y = mavlink_msg_position_control_offset_set_get_y(msg);
-	position_control_offset_set->z = mavlink_msg_position_control_offset_set_get_z(msg);
-	position_control_offset_set->yaw = mavlink_msg_position_control_offset_set_get_yaw(msg);
-#else
-	memcpy(position_control_offset_set, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint.h
deleted file mode 100644
index 3e13f402d..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// MESSAGE POSITION_CONTROL_SETPOINT PACKING
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT 170
-
-typedef struct __mavlink_position_control_setpoint_t
-{
- uint16_t id; ///< ID of waypoint, 0 for plain position
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float yaw; ///< yaw orientation in radians, 0 = NORTH
-} mavlink_position_control_setpoint_t;
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_LEN 18
-#define MAVLINK_MSG_ID_170_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT { \
-	"POSITION_CONTROL_SETPOINT", \
-	5, \
-	{  { "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_position_control_setpoint_t, id) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_position_control_setpoint_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_position_control_setpoint_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_position_control_setpoint_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_position_control_setpoint_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a position_control_setpoint message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t id, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_position_control_setpoint_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a position_control_setpoint message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t id,float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_position_control_setpoint_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a position_control_setpoint struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param position_control_setpoint C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_position_control_setpoint_t* position_control_setpoint)
-{
-	return mavlink_msg_position_control_setpoint_pack(system_id, component_id, msg, position_control_setpoint->id, position_control_setpoint->x, position_control_setpoint->y, position_control_setpoint->z, position_control_setpoint->yaw);
-}
-
-/**
- * @brief Send a position_control_setpoint message
- * @param chan MAVLink channel to send the message
- *
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_position_control_setpoint_send(mavlink_channel_t chan, uint16_t id, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_uint16_t(buf, 0, id);
-	_mav_put_float(buf, 2, x);
-	_mav_put_float(buf, 6, y);
-	_mav_put_float(buf, 10, z);
-	_mav_put_float(buf, 14, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, buf, 18);
-#else
-	mavlink_position_control_setpoint_t packet;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE POSITION_CONTROL_SETPOINT UNPACKING
-
-
-/**
- * @brief Get field id from position_control_setpoint message
- *
- * @return ID of waypoint, 0 for plain position
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_get_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field x from position_control_setpoint message
- *
- * @return x position
- */
-static inline float mavlink_msg_position_control_setpoint_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  2);
-}
-
-/**
- * @brief Get field y from position_control_setpoint message
- *
- * @return y position
- */
-static inline float mavlink_msg_position_control_setpoint_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  6);
-}
-
-/**
- * @brief Get field z from position_control_setpoint message
- *
- * @return z position
- */
-static inline float mavlink_msg_position_control_setpoint_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  10);
-}
-
-/**
- * @brief Get field yaw from position_control_setpoint message
- *
- * @return yaw orientation in radians, 0 = NORTH
- */
-static inline float mavlink_msg_position_control_setpoint_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  14);
-}
-
-/**
- * @brief Decode a position_control_setpoint message into a struct
- *
- * @param msg The message to decode
- * @param position_control_setpoint C-struct to decode the message contents into
- */
-static inline void mavlink_msg_position_control_setpoint_decode(const mavlink_message_t* msg, mavlink_position_control_setpoint_t* position_control_setpoint)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	position_control_setpoint->id = mavlink_msg_position_control_setpoint_get_id(msg);
-	position_control_setpoint->x = mavlink_msg_position_control_setpoint_get_x(msg);
-	position_control_setpoint->y = mavlink_msg_position_control_setpoint_get_y(msg);
-	position_control_setpoint->z = mavlink_msg_position_control_setpoint_get_z(msg);
-	position_control_setpoint->yaw = mavlink_msg_position_control_setpoint_get_yaw(msg);
-#else
-	memcpy(position_control_setpoint, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint_set.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint_set.h
deleted file mode 100644
index 4a556e57f..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint_set.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE POSITION_CONTROL_SETPOINT_SET PACKING
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET 159
-
-typedef struct __mavlink_position_control_setpoint_set_t
-{
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
- uint16_t id; ///< ID of waypoint, 0 for plain position
- float x; ///< x position
- float y; ///< y position
- float z; ///< z position
- float yaw; ///< yaw orientation in radians, 0 = NORTH
-} mavlink_position_control_setpoint_set_t;
-
-#define MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET_LEN 20
-#define MAVLINK_MSG_ID_159_LEN 20
-
-
-
-#define MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT_SET { \
-	"POSITION_CONTROL_SETPOINT_SET", \
-	7, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_position_control_setpoint_set_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_position_control_setpoint_set_t, target_component) }, \
-         { "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_position_control_setpoint_set_t, id) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_position_control_setpoint_set_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_position_control_setpoint_set_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_position_control_setpoint_set_t, z) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_position_control_setpoint_set_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a position_control_setpoint_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint16_t id, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, id);
-	_mav_put_float(buf, 4, x);
-	_mav_put_float(buf, 8, y);
-	_mav_put_float(buf, 12, z);
-	_mav_put_float(buf, 16, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_position_control_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 20);
-}
-
-/**
- * @brief Pack a position_control_setpoint_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint16_t id,float x,float y,float z,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, id);
-	_mav_put_float(buf, 4, x);
-	_mav_put_float(buf, 8, y);
-	_mav_put_float(buf, 12, z);
-	_mav_put_float(buf, 16, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_position_control_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20);
-}
-
-/**
- * @brief Encode a position_control_setpoint_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param position_control_setpoint_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_position_control_setpoint_set_t* position_control_setpoint_set)
-{
-	return mavlink_msg_position_control_setpoint_set_pack(system_id, component_id, msg, position_control_setpoint_set->target_system, position_control_setpoint_set->target_component, position_control_setpoint_set->id, position_control_setpoint_set->x, position_control_setpoint_set->y, position_control_setpoint_set->z, position_control_setpoint_set->yaw);
-}
-
-/**
- * @brief Send a position_control_setpoint_set message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param id ID of waypoint, 0 for plain position
- * @param x x position
- * @param y y position
- * @param z z position
- * @param yaw yaw orientation in radians, 0 = NORTH
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_position_control_setpoint_set_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint16_t id, float x, float y, float z, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint16_t(buf, 2, id);
-	_mav_put_float(buf, 4, x);
-	_mav_put_float(buf, 8, y);
-	_mav_put_float(buf, 12, z);
-	_mav_put_float(buf, 16, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET, buf, 20);
-#else
-	mavlink_position_control_setpoint_set_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.id = id;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_SET, (const char *)&packet, 20);
-#endif
-}
-
-#endif
-
-// MESSAGE POSITION_CONTROL_SETPOINT_SET UNPACKING
-
-
-/**
- * @brief Get field target_system from position_control_setpoint_set message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_position_control_setpoint_set_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from position_control_setpoint_set message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_position_control_setpoint_set_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field id from position_control_setpoint_set message
- *
- * @return ID of waypoint, 0 for plain position
- */
-static inline uint16_t mavlink_msg_position_control_setpoint_set_get_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field x from position_control_setpoint_set message
- *
- * @return x position
- */
-static inline float mavlink_msg_position_control_setpoint_set_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field y from position_control_setpoint_set message
- *
- * @return y position
- */
-static inline float mavlink_msg_position_control_setpoint_set_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field z from position_control_setpoint_set message
- *
- * @return z position
- */
-static inline float mavlink_msg_position_control_setpoint_set_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field yaw from position_control_setpoint_set message
- *
- * @return yaw orientation in radians, 0 = NORTH
- */
-static inline float mavlink_msg_position_control_setpoint_set_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Decode a position_control_setpoint_set message into a struct
- *
- * @param msg The message to decode
- * @param position_control_setpoint_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_position_control_setpoint_set_decode(const mavlink_message_t* msg, mavlink_position_control_setpoint_set_t* position_control_setpoint_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	position_control_setpoint_set->target_system = mavlink_msg_position_control_setpoint_set_get_target_system(msg);
-	position_control_setpoint_set->target_component = mavlink_msg_position_control_setpoint_set_get_target_component(msg);
-	position_control_setpoint_set->id = mavlink_msg_position_control_setpoint_set_get_id(msg);
-	position_control_setpoint_set->x = mavlink_msg_position_control_setpoint_set_get_x(msg);
-	position_control_setpoint_set->y = mavlink_msg_position_control_setpoint_set_get_y(msg);
-	position_control_setpoint_set->z = mavlink_msg_position_control_setpoint_set_get_z(msg);
-	position_control_setpoint_set->yaw = mavlink_msg_position_control_setpoint_set_get_yaw(msg);
-#else
-	memcpy(position_control_setpoint_set, _MAV_PAYLOAD(msg), 20);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_raw_aux.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_raw_aux.h
deleted file mode 100644
index 154653de2..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_raw_aux.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE RAW_AUX PACKING
-
-#define MAVLINK_MSG_ID_RAW_AUX 172
-
-typedef struct __mavlink_raw_aux_t
-{
- uint16_t adc1; ///< ADC1 (J405 ADC3, LPC2148 AD0.6)
- uint16_t adc2; ///< ADC2 (J405 ADC5, LPC2148 AD0.2)
- uint16_t adc3; ///< ADC3 (J405 ADC6, LPC2148 AD0.1)
- uint16_t adc4; ///< ADC4 (J405 ADC7, LPC2148 AD1.3)
- uint16_t vbat; ///< Battery voltage
- int16_t temp; ///< Temperature (degrees celcius)
- int32_t baro; ///< Barometric pressure (hecto Pascal)
-} mavlink_raw_aux_t;
-
-#define MAVLINK_MSG_ID_RAW_AUX_LEN 16
-#define MAVLINK_MSG_ID_172_LEN 16
-
-
-
-#define MAVLINK_MESSAGE_INFO_RAW_AUX { \
-	"RAW_AUX", \
-	7, \
-	{  { "adc1", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_raw_aux_t, adc1) }, \
-         { "adc2", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_raw_aux_t, adc2) }, \
-         { "adc3", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_raw_aux_t, adc3) }, \
-         { "adc4", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_raw_aux_t, adc4) }, \
-         { "vbat", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_raw_aux_t, vbat) }, \
-         { "temp", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_aux_t, temp) }, \
-         { "baro", NULL, MAVLINK_TYPE_INT32_T, 0, 12, offsetof(mavlink_raw_aux_t, baro) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a raw_aux message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param adc1 ADC1 (J405 ADC3, LPC2148 AD0.6)
- * @param adc2 ADC2 (J405 ADC5, LPC2148 AD0.2)
- * @param adc3 ADC3 (J405 ADC6, LPC2148 AD0.1)
- * @param adc4 ADC4 (J405 ADC7, LPC2148 AD1.3)
- * @param vbat Battery voltage
- * @param temp Temperature (degrees celcius)
- * @param baro Barometric pressure (hecto Pascal)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_aux_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t adc1, uint16_t adc2, uint16_t adc3, uint16_t adc4, uint16_t vbat, int16_t temp, int32_t baro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, vbat);
-	_mav_put_int16_t(buf, 10, temp);
-	_mav_put_int32_t(buf, 12, baro);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_raw_aux_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.vbat = vbat;
-	packet.temp = temp;
-	packet.baro = baro;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_AUX;
-	return mavlink_finalize_message(msg, system_id, component_id, 16);
-}
-
-/**
- * @brief Pack a raw_aux message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param adc1 ADC1 (J405 ADC3, LPC2148 AD0.6)
- * @param adc2 ADC2 (J405 ADC5, LPC2148 AD0.2)
- * @param adc3 ADC3 (J405 ADC6, LPC2148 AD0.1)
- * @param adc4 ADC4 (J405 ADC7, LPC2148 AD1.3)
- * @param vbat Battery voltage
- * @param temp Temperature (degrees celcius)
- * @param baro Barometric pressure (hecto Pascal)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_raw_aux_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t adc1,uint16_t adc2,uint16_t adc3,uint16_t adc4,uint16_t vbat,int16_t temp,int32_t baro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, vbat);
-	_mav_put_int16_t(buf, 10, temp);
-	_mav_put_int32_t(buf, 12, baro);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
-#else
-	mavlink_raw_aux_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.vbat = vbat;
-	packet.temp = temp;
-	packet.baro = baro;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RAW_AUX;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
-}
-
-/**
- * @brief Encode a raw_aux struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param raw_aux C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_raw_aux_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_raw_aux_t* raw_aux)
-{
-	return mavlink_msg_raw_aux_pack(system_id, component_id, msg, raw_aux->adc1, raw_aux->adc2, raw_aux->adc3, raw_aux->adc4, raw_aux->vbat, raw_aux->temp, raw_aux->baro);
-}
-
-/**
- * @brief Send a raw_aux message
- * @param chan MAVLink channel to send the message
- *
- * @param adc1 ADC1 (J405 ADC3, LPC2148 AD0.6)
- * @param adc2 ADC2 (J405 ADC5, LPC2148 AD0.2)
- * @param adc3 ADC3 (J405 ADC6, LPC2148 AD0.1)
- * @param adc4 ADC4 (J405 ADC7, LPC2148 AD1.3)
- * @param vbat Battery voltage
- * @param temp Temperature (degrees celcius)
- * @param baro Barometric pressure (hecto Pascal)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_raw_aux_send(mavlink_channel_t chan, uint16_t adc1, uint16_t adc2, uint16_t adc3, uint16_t adc4, uint16_t vbat, int16_t temp, int32_t baro)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[16];
-	_mav_put_uint16_t(buf, 0, adc1);
-	_mav_put_uint16_t(buf, 2, adc2);
-	_mav_put_uint16_t(buf, 4, adc3);
-	_mav_put_uint16_t(buf, 6, adc4);
-	_mav_put_uint16_t(buf, 8, vbat);
-	_mav_put_int16_t(buf, 10, temp);
-	_mav_put_int32_t(buf, 12, baro);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, buf, 16);
-#else
-	mavlink_raw_aux_t packet;
-	packet.adc1 = adc1;
-	packet.adc2 = adc2;
-	packet.adc3 = adc3;
-	packet.adc4 = adc4;
-	packet.vbat = vbat;
-	packet.temp = temp;
-	packet.baro = baro;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, (const char *)&packet, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE RAW_AUX UNPACKING
-
-
-/**
- * @brief Get field adc1 from raw_aux message
- *
- * @return ADC1 (J405 ADC3, LPC2148 AD0.6)
- */
-static inline uint16_t mavlink_msg_raw_aux_get_adc1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field adc2 from raw_aux message
- *
- * @return ADC2 (J405 ADC5, LPC2148 AD0.2)
- */
-static inline uint16_t mavlink_msg_raw_aux_get_adc2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field adc3 from raw_aux message
- *
- * @return ADC3 (J405 ADC6, LPC2148 AD0.1)
- */
-static inline uint16_t mavlink_msg_raw_aux_get_adc3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  4);
-}
-
-/**
- * @brief Get field adc4 from raw_aux message
- *
- * @return ADC4 (J405 ADC7, LPC2148 AD1.3)
- */
-static inline uint16_t mavlink_msg_raw_aux_get_adc4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  6);
-}
-
-/**
- * @brief Get field vbat from raw_aux message
- *
- * @return Battery voltage
- */
-static inline uint16_t mavlink_msg_raw_aux_get_vbat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Get field temp from raw_aux message
- *
- * @return Temperature (degrees celcius)
- */
-static inline int16_t mavlink_msg_raw_aux_get_temp(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  10);
-}
-
-/**
- * @brief Get field baro from raw_aux message
- *
- * @return Barometric pressure (hecto Pascal)
- */
-static inline int32_t mavlink_msg_raw_aux_get_baro(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  12);
-}
-
-/**
- * @brief Decode a raw_aux message into a struct
- *
- * @param msg The message to decode
- * @param raw_aux C-struct to decode the message contents into
- */
-static inline void mavlink_msg_raw_aux_decode(const mavlink_message_t* msg, mavlink_raw_aux_t* raw_aux)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	raw_aux->adc1 = mavlink_msg_raw_aux_get_adc1(msg);
-	raw_aux->adc2 = mavlink_msg_raw_aux_get_adc2(msg);
-	raw_aux->adc3 = mavlink_msg_raw_aux_get_adc3(msg);
-	raw_aux->adc4 = mavlink_msg_raw_aux_get_adc4(msg);
-	raw_aux->vbat = mavlink_msg_raw_aux_get_vbat(msg);
-	raw_aux->temp = mavlink_msg_raw_aux_get_temp(msg);
-	raw_aux->baro = mavlink_msg_raw_aux_get_baro(msg);
-#else
-	memcpy(raw_aux, _MAV_PAYLOAD(msg), 16);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_set_cam_shutter.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_set_cam_shutter.h
deleted file mode 100644
index c51ac730d..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_set_cam_shutter.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE SET_CAM_SHUTTER PACKING
-
-#define MAVLINK_MSG_ID_SET_CAM_SHUTTER 151
-
-typedef struct __mavlink_set_cam_shutter_t
-{
- uint8_t cam_no; ///< Camera id
- uint8_t cam_mode; ///< Camera mode: 0 = auto, 1 = manual
- uint8_t trigger_pin; ///< Trigger pin, 0-3 for PtGrey FireFly
- uint16_t interval; ///< Shutter interval, in microseconds
- uint16_t exposure; ///< Exposure time, in microseconds
- float gain; ///< Camera gain
-} mavlink_set_cam_shutter_t;
-
-#define MAVLINK_MSG_ID_SET_CAM_SHUTTER_LEN 11
-#define MAVLINK_MSG_ID_151_LEN 11
-
-
-
-#define MAVLINK_MESSAGE_INFO_SET_CAM_SHUTTER { \
-	"SET_CAM_SHUTTER", \
-	6, \
-	{  { "cam_no", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_cam_shutter_t, cam_no) }, \
-         { "cam_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_cam_shutter_t, cam_mode) }, \
-         { "trigger_pin", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_set_cam_shutter_t, trigger_pin) }, \
-         { "interval", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_set_cam_shutter_t, interval) }, \
-         { "exposure", NULL, MAVLINK_TYPE_UINT16_T, 0, 5, offsetof(mavlink_set_cam_shutter_t, exposure) }, \
-         { "gain", NULL, MAVLINK_TYPE_FLOAT, 0, 7, offsetof(mavlink_set_cam_shutter_t, gain) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a set_cam_shutter message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param cam_no Camera id
- * @param cam_mode Camera mode: 0 = auto, 1 = manual
- * @param trigger_pin Trigger pin, 0-3 for PtGrey FireFly
- * @param interval Shutter interval, in microseconds
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_cam_shutter_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t cam_no, uint8_t cam_mode, uint8_t trigger_pin, uint16_t interval, uint16_t exposure, float gain)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, cam_no);
-	_mav_put_uint8_t(buf, 1, cam_mode);
-	_mav_put_uint8_t(buf, 2, trigger_pin);
-	_mav_put_uint16_t(buf, 3, interval);
-	_mav_put_uint16_t(buf, 5, exposure);
-	_mav_put_float(buf, 7, gain);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
-#else
-	mavlink_set_cam_shutter_t packet;
-	packet.cam_no = cam_no;
-	packet.cam_mode = cam_mode;
-	packet.trigger_pin = trigger_pin;
-	packet.interval = interval;
-	packet.exposure = exposure;
-	packet.gain = gain;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_CAM_SHUTTER;
-	return mavlink_finalize_message(msg, system_id, component_id, 11);
-}
-
-/**
- * @brief Pack a set_cam_shutter message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param cam_no Camera id
- * @param cam_mode Camera mode: 0 = auto, 1 = manual
- * @param trigger_pin Trigger pin, 0-3 for PtGrey FireFly
- * @param interval Shutter interval, in microseconds
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_set_cam_shutter_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t cam_no,uint8_t cam_mode,uint8_t trigger_pin,uint16_t interval,uint16_t exposure,float gain)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, cam_no);
-	_mav_put_uint8_t(buf, 1, cam_mode);
-	_mav_put_uint8_t(buf, 2, trigger_pin);
-	_mav_put_uint16_t(buf, 3, interval);
-	_mav_put_uint16_t(buf, 5, exposure);
-	_mav_put_float(buf, 7, gain);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
-#else
-	mavlink_set_cam_shutter_t packet;
-	packet.cam_no = cam_no;
-	packet.cam_mode = cam_mode;
-	packet.trigger_pin = trigger_pin;
-	packet.interval = interval;
-	packet.exposure = exposure;
-	packet.gain = gain;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SET_CAM_SHUTTER;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 11);
-}
-
-/**
- * @brief Encode a set_cam_shutter struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param set_cam_shutter C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_set_cam_shutter_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_cam_shutter_t* set_cam_shutter)
-{
-	return mavlink_msg_set_cam_shutter_pack(system_id, component_id, msg, set_cam_shutter->cam_no, set_cam_shutter->cam_mode, set_cam_shutter->trigger_pin, set_cam_shutter->interval, set_cam_shutter->exposure, set_cam_shutter->gain);
-}
-
-/**
- * @brief Send a set_cam_shutter message
- * @param chan MAVLink channel to send the message
- *
- * @param cam_no Camera id
- * @param cam_mode Camera mode: 0 = auto, 1 = manual
- * @param trigger_pin Trigger pin, 0-3 for PtGrey FireFly
- * @param interval Shutter interval, in microseconds
- * @param exposure Exposure time, in microseconds
- * @param gain Camera gain
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_set_cam_shutter_send(mavlink_channel_t chan, uint8_t cam_no, uint8_t cam_mode, uint8_t trigger_pin, uint16_t interval, uint16_t exposure, float gain)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[11];
-	_mav_put_uint8_t(buf, 0, cam_no);
-	_mav_put_uint8_t(buf, 1, cam_mode);
-	_mav_put_uint8_t(buf, 2, trigger_pin);
-	_mav_put_uint16_t(buf, 3, interval);
-	_mav_put_uint16_t(buf, 5, exposure);
-	_mav_put_float(buf, 7, gain);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, buf, 11);
-#else
-	mavlink_set_cam_shutter_t packet;
-	packet.cam_no = cam_no;
-	packet.cam_mode = cam_mode;
-	packet.trigger_pin = trigger_pin;
-	packet.interval = interval;
-	packet.exposure = exposure;
-	packet.gain = gain;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, (const char *)&packet, 11);
-#endif
-}
-
-#endif
-
-// MESSAGE SET_CAM_SHUTTER UNPACKING
-
-
-/**
- * @brief Get field cam_no from set_cam_shutter message
- *
- * @return Camera id
- */
-static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_no(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field cam_mode from set_cam_shutter message
- *
- * @return Camera mode: 0 = auto, 1 = manual
- */
-static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field trigger_pin from set_cam_shutter message
- *
- * @return Trigger pin, 0-3 for PtGrey FireFly
- */
-static inline uint8_t mavlink_msg_set_cam_shutter_get_trigger_pin(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field interval from set_cam_shutter message
- *
- * @return Shutter interval, in microseconds
- */
-static inline uint16_t mavlink_msg_set_cam_shutter_get_interval(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field exposure from set_cam_shutter message
- *
- * @return Exposure time, in microseconds
- */
-static inline uint16_t mavlink_msg_set_cam_shutter_get_exposure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  5);
-}
-
-/**
- * @brief Get field gain from set_cam_shutter message
- *
- * @return Camera gain
- */
-static inline float mavlink_msg_set_cam_shutter_get_gain(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  7);
-}
-
-/**
- * @brief Decode a set_cam_shutter message into a struct
- *
- * @param msg The message to decode
- * @param set_cam_shutter C-struct to decode the message contents into
- */
-static inline void mavlink_msg_set_cam_shutter_decode(const mavlink_message_t* msg, mavlink_set_cam_shutter_t* set_cam_shutter)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	set_cam_shutter->cam_no = mavlink_msg_set_cam_shutter_get_cam_no(msg);
-	set_cam_shutter->cam_mode = mavlink_msg_set_cam_shutter_get_cam_mode(msg);
-	set_cam_shutter->trigger_pin = mavlink_msg_set_cam_shutter_get_trigger_pin(msg);
-	set_cam_shutter->interval = mavlink_msg_set_cam_shutter_get_interval(msg);
-	set_cam_shutter->exposure = mavlink_msg_set_cam_shutter_get_exposure(msg);
-	set_cam_shutter->gain = mavlink_msg_set_cam_shutter_get_gain(msg);
-#else
-	memcpy(set_cam_shutter, _MAV_PAYLOAD(msg), 11);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vicon_position_estimate.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vicon_position_estimate.h
deleted file mode 100644
index d2b4fbefb..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vicon_position_estimate.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE VICON_POSITION_ESTIMATE PACKING
-
-#define MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE 157
-
-typedef struct __mavlink_vicon_position_estimate_t
-{
- uint64_t usec; ///< Timestamp (milliseconds)
- float x; ///< Global X position
- float y; ///< Global Y position
- float z; ///< Global Z position
- float roll; ///< Roll angle in rad
- float pitch; ///< Pitch angle in rad
- float yaw; ///< Yaw angle in rad
-} mavlink_vicon_position_estimate_t;
-
-#define MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE_LEN 32
-#define MAVLINK_MSG_ID_157_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE { \
-	"VICON_POSITION_ESTIMATE", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_vicon_position_estimate_t, usec) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_vicon_position_estimate_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_vicon_position_estimate_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_vicon_position_estimate_t, z) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_vicon_position_estimate_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_vicon_position_estimate_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_vicon_position_estimate_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a vicon_position_estimate message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vicon_position_estimate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_vicon_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a vicon_position_estimate message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vicon_position_estimate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float x,float y,float z,float roll,float pitch,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_vicon_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a vicon_position_estimate struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param vicon_position_estimate C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_vicon_position_estimate_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vicon_position_estimate_t* vicon_position_estimate)
-{
-	return mavlink_msg_vicon_position_estimate_pack(system_id, component_id, msg, vicon_position_estimate->usec, vicon_position_estimate->x, vicon_position_estimate->y, vicon_position_estimate->z, vicon_position_estimate->roll, vicon_position_estimate->pitch, vicon_position_estimate->yaw);
-}
-
-/**
- * @brief Send a vicon_position_estimate message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_vicon_position_estimate_send(mavlink_channel_t chan, uint64_t usec, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, buf, 32);
-#else
-	mavlink_vicon_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE VICON_POSITION_ESTIMATE UNPACKING
-
-
-/**
- * @brief Get field usec from vicon_position_estimate message
- *
- * @return Timestamp (milliseconds)
- */
-static inline uint64_t mavlink_msg_vicon_position_estimate_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field x from vicon_position_estimate message
- *
- * @return Global X position
- */
-static inline float mavlink_msg_vicon_position_estimate_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field y from vicon_position_estimate message
- *
- * @return Global Y position
- */
-static inline float mavlink_msg_vicon_position_estimate_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field z from vicon_position_estimate message
- *
- * @return Global Z position
- */
-static inline float mavlink_msg_vicon_position_estimate_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field roll from vicon_position_estimate message
- *
- * @return Roll angle in rad
- */
-static inline float mavlink_msg_vicon_position_estimate_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field pitch from vicon_position_estimate message
- *
- * @return Pitch angle in rad
- */
-static inline float mavlink_msg_vicon_position_estimate_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field yaw from vicon_position_estimate message
- *
- * @return Yaw angle in rad
- */
-static inline float mavlink_msg_vicon_position_estimate_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a vicon_position_estimate message into a struct
- *
- * @param msg The message to decode
- * @param vicon_position_estimate C-struct to decode the message contents into
- */
-static inline void mavlink_msg_vicon_position_estimate_decode(const mavlink_message_t* msg, mavlink_vicon_position_estimate_t* vicon_position_estimate)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	vicon_position_estimate->usec = mavlink_msg_vicon_position_estimate_get_usec(msg);
-	vicon_position_estimate->x = mavlink_msg_vicon_position_estimate_get_x(msg);
-	vicon_position_estimate->y = mavlink_msg_vicon_position_estimate_get_y(msg);
-	vicon_position_estimate->z = mavlink_msg_vicon_position_estimate_get_z(msg);
-	vicon_position_estimate->roll = mavlink_msg_vicon_position_estimate_get_roll(msg);
-	vicon_position_estimate->pitch = mavlink_msg_vicon_position_estimate_get_pitch(msg);
-	vicon_position_estimate->yaw = mavlink_msg_vicon_position_estimate_get_yaw(msg);
-#else
-	memcpy(vicon_position_estimate, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_position_estimate.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_position_estimate.h
deleted file mode 100644
index d257972b7..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_position_estimate.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE VISION_POSITION_ESTIMATE PACKING
-
-#define MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE 156
-
-typedef struct __mavlink_vision_position_estimate_t
-{
- uint64_t usec; ///< Timestamp (milliseconds)
- float x; ///< Global X position
- float y; ///< Global Y position
- float z; ///< Global Z position
- float roll; ///< Roll angle in rad
- float pitch; ///< Pitch angle in rad
- float yaw; ///< Yaw angle in rad
-} mavlink_vision_position_estimate_t;
-
-#define MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE_LEN 32
-#define MAVLINK_MSG_ID_156_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE { \
-	"VISION_POSITION_ESTIMATE", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_vision_position_estimate_t, usec) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_vision_position_estimate_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_vision_position_estimate_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_vision_position_estimate_t, z) }, \
-         { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_vision_position_estimate_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_vision_position_estimate_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_vision_position_estimate_t, yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a vision_position_estimate message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vision_position_estimate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_vision_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a vision_position_estimate message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vision_position_estimate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float x,float y,float z,float roll,float pitch,float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_vision_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a vision_position_estimate struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param vision_position_estimate C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_vision_position_estimate_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vision_position_estimate_t* vision_position_estimate)
-{
-	return mavlink_msg_vision_position_estimate_pack(system_id, component_id, msg, vision_position_estimate->usec, vision_position_estimate->x, vision_position_estimate->y, vision_position_estimate->z, vision_position_estimate->roll, vision_position_estimate->pitch, vision_position_estimate->yaw);
-}
-
-/**
- * @brief Send a vision_position_estimate message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X position
- * @param y Global Y position
- * @param z Global Z position
- * @param roll Roll angle in rad
- * @param pitch Pitch angle in rad
- * @param yaw Yaw angle in rad
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_vision_position_estimate_send(mavlink_channel_t chan, uint64_t usec, float x, float y, float z, float roll, float pitch, float yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-	_mav_put_float(buf, 20, roll);
-	_mav_put_float(buf, 24, pitch);
-	_mav_put_float(buf, 28, yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, buf, 32);
-#else
-	mavlink_vision_position_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-	packet.roll = roll;
-	packet.pitch = pitch;
-	packet.yaw = yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE VISION_POSITION_ESTIMATE UNPACKING
-
-
-/**
- * @brief Get field usec from vision_position_estimate message
- *
- * @return Timestamp (milliseconds)
- */
-static inline uint64_t mavlink_msg_vision_position_estimate_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field x from vision_position_estimate message
- *
- * @return Global X position
- */
-static inline float mavlink_msg_vision_position_estimate_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field y from vision_position_estimate message
- *
- * @return Global Y position
- */
-static inline float mavlink_msg_vision_position_estimate_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field z from vision_position_estimate message
- *
- * @return Global Z position
- */
-static inline float mavlink_msg_vision_position_estimate_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field roll from vision_position_estimate message
- *
- * @return Roll angle in rad
- */
-static inline float mavlink_msg_vision_position_estimate_get_roll(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field pitch from vision_position_estimate message
- *
- * @return Pitch angle in rad
- */
-static inline float mavlink_msg_vision_position_estimate_get_pitch(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field yaw from vision_position_estimate message
- *
- * @return Yaw angle in rad
- */
-static inline float mavlink_msg_vision_position_estimate_get_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a vision_position_estimate message into a struct
- *
- * @param msg The message to decode
- * @param vision_position_estimate C-struct to decode the message contents into
- */
-static inline void mavlink_msg_vision_position_estimate_decode(const mavlink_message_t* msg, mavlink_vision_position_estimate_t* vision_position_estimate)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	vision_position_estimate->usec = mavlink_msg_vision_position_estimate_get_usec(msg);
-	vision_position_estimate->x = mavlink_msg_vision_position_estimate_get_x(msg);
-	vision_position_estimate->y = mavlink_msg_vision_position_estimate_get_y(msg);
-	vision_position_estimate->z = mavlink_msg_vision_position_estimate_get_z(msg);
-	vision_position_estimate->roll = mavlink_msg_vision_position_estimate_get_roll(msg);
-	vision_position_estimate->pitch = mavlink_msg_vision_position_estimate_get_pitch(msg);
-	vision_position_estimate->yaw = mavlink_msg_vision_position_estimate_get_yaw(msg);
-#else
-	memcpy(vision_position_estimate, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_speed_estimate.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_speed_estimate.h
deleted file mode 100644
index 22929dd21..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_speed_estimate.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE VISION_SPEED_ESTIMATE PACKING
-
-#define MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE 158
-
-typedef struct __mavlink_vision_speed_estimate_t
-{
- uint64_t usec; ///< Timestamp (milliseconds)
- float x; ///< Global X speed
- float y; ///< Global Y speed
- float z; ///< Global Z speed
-} mavlink_vision_speed_estimate_t;
-
-#define MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE_LEN 20
-#define MAVLINK_MSG_ID_158_LEN 20
-
-
-
-#define MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE { \
-	"VISION_SPEED_ESTIMATE", \
-	4, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_vision_speed_estimate_t, usec) }, \
-         { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_vision_speed_estimate_t, x) }, \
-         { "y", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_vision_speed_estimate_t, y) }, \
-         { "z", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_vision_speed_estimate_t, z) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a vision_speed_estimate message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X speed
- * @param y Global Y speed
- * @param z Global Z speed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vision_speed_estimate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_vision_speed_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 20);
-}
-
-/**
- * @brief Pack a vision_speed_estimate message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (milliseconds)
- * @param x Global X speed
- * @param y Global Y speed
- * @param z Global Z speed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_vision_speed_estimate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float x,float y,float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 20);
-#else
-	mavlink_vision_speed_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20);
-}
-
-/**
- * @brief Encode a vision_speed_estimate struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param vision_speed_estimate C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_vision_speed_estimate_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vision_speed_estimate_t* vision_speed_estimate)
-{
-	return mavlink_msg_vision_speed_estimate_pack(system_id, component_id, msg, vision_speed_estimate->usec, vision_speed_estimate->x, vision_speed_estimate->y, vision_speed_estimate->z);
-}
-
-/**
- * @brief Send a vision_speed_estimate message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (milliseconds)
- * @param x Global X speed
- * @param y Global Y speed
- * @param z Global Z speed
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_vision_speed_estimate_send(mavlink_channel_t chan, uint64_t usec, float x, float y, float z)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, x);
-	_mav_put_float(buf, 12, y);
-	_mav_put_float(buf, 16, z);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, buf, 20);
-#else
-	mavlink_vision_speed_estimate_t packet;
-	packet.usec = usec;
-	packet.x = x;
-	packet.y = y;
-	packet.z = z;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, (const char *)&packet, 20);
-#endif
-}
-
-#endif
-
-// MESSAGE VISION_SPEED_ESTIMATE UNPACKING
-
-
-/**
- * @brief Get field usec from vision_speed_estimate message
- *
- * @return Timestamp (milliseconds)
- */
-static inline uint64_t mavlink_msg_vision_speed_estimate_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field x from vision_speed_estimate message
- *
- * @return Global X speed
- */
-static inline float mavlink_msg_vision_speed_estimate_get_x(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field y from vision_speed_estimate message
- *
- * @return Global Y speed
- */
-static inline float mavlink_msg_vision_speed_estimate_get_y(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field z from vision_speed_estimate message
- *
- * @return Global Z speed
- */
-static inline float mavlink_msg_vision_speed_estimate_get_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Decode a vision_speed_estimate message into a struct
- *
- * @param msg The message to decode
- * @param vision_speed_estimate C-struct to decode the message contents into
- */
-static inline void mavlink_msg_vision_speed_estimate_decode(const mavlink_message_t* msg, mavlink_vision_speed_estimate_t* vision_speed_estimate)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	vision_speed_estimate->usec = mavlink_msg_vision_speed_estimate_get_usec(msg);
-	vision_speed_estimate->x = mavlink_msg_vision_speed_estimate_get_x(msg);
-	vision_speed_estimate->y = mavlink_msg_vision_speed_estimate_get_y(msg);
-	vision_speed_estimate->z = mavlink_msg_vision_speed_estimate_get_z(msg);
-#else
-	memcpy(vision_speed_estimate, _MAV_PAYLOAD(msg), 20);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_command.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_command.h
deleted file mode 100644
index a3ffe71ad..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_command.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE WATCHDOG_COMMAND PACKING
-
-#define MAVLINK_MSG_ID_WATCHDOG_COMMAND 183
-
-typedef struct __mavlink_watchdog_command_t
-{
- uint8_t target_system_id; ///< Target system ID
- uint16_t watchdog_id; ///< Watchdog ID
- uint16_t process_id; ///< Process ID
- uint8_t command_id; ///< Command ID
-} mavlink_watchdog_command_t;
-
-#define MAVLINK_MSG_ID_WATCHDOG_COMMAND_LEN 6
-#define MAVLINK_MSG_ID_183_LEN 6
-
-
-
-#define MAVLINK_MESSAGE_INFO_WATCHDOG_COMMAND { \
-	"WATCHDOG_COMMAND", \
-	4, \
-	{  { "target_system_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_watchdog_command_t, target_system_id) }, \
-         { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 1, offsetof(mavlink_watchdog_command_t, watchdog_id) }, \
-         { "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_watchdog_command_t, process_id) }, \
-         { "command_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_watchdog_command_t, command_id) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a watchdog_command message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system_id Target system ID
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param command_id Command ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_command_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system_id, uint16_t watchdog_id, uint16_t process_id, uint8_t command_id)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system_id);
-	_mav_put_uint16_t(buf, 1, watchdog_id);
-	_mav_put_uint16_t(buf, 3, process_id);
-	_mav_put_uint8_t(buf, 5, command_id);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_watchdog_command_t packet;
-	packet.target_system_id = target_system_id;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.command_id = command_id;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_COMMAND;
-	return mavlink_finalize_message(msg, system_id, component_id, 6);
-}
-
-/**
- * @brief Pack a watchdog_command message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system_id Target system ID
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param command_id Command ID
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_command_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system_id,uint16_t watchdog_id,uint16_t process_id,uint8_t command_id)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system_id);
-	_mav_put_uint16_t(buf, 1, watchdog_id);
-	_mav_put_uint16_t(buf, 3, process_id);
-	_mav_put_uint8_t(buf, 5, command_id);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
-#else
-	mavlink_watchdog_command_t packet;
-	packet.target_system_id = target_system_id;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.command_id = command_id;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_COMMAND;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 6);
-}
-
-/**
- * @brief Encode a watchdog_command struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_command C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_watchdog_command_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_watchdog_command_t* watchdog_command)
-{
-	return mavlink_msg_watchdog_command_pack(system_id, component_id, msg, watchdog_command->target_system_id, watchdog_command->watchdog_id, watchdog_command->process_id, watchdog_command->command_id);
-}
-
-/**
- * @brief Send a watchdog_command message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system_id Target system ID
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param command_id Command ID
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_watchdog_command_send(mavlink_channel_t chan, uint8_t target_system_id, uint16_t watchdog_id, uint16_t process_id, uint8_t command_id)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[6];
-	_mav_put_uint8_t(buf, 0, target_system_id);
-	_mav_put_uint16_t(buf, 1, watchdog_id);
-	_mav_put_uint16_t(buf, 3, process_id);
-	_mav_put_uint8_t(buf, 5, command_id);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, buf, 6);
-#else
-	mavlink_watchdog_command_t packet;
-	packet.target_system_id = target_system_id;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.command_id = command_id;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, (const char *)&packet, 6);
-#endif
-}
-
-#endif
-
-// MESSAGE WATCHDOG_COMMAND UNPACKING
-
-
-/**
- * @brief Get field target_system_id from watchdog_command message
- *
- * @return Target system ID
- */
-static inline uint8_t mavlink_msg_watchdog_command_get_target_system_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field watchdog_id from watchdog_command message
- *
- * @return Watchdog ID
- */
-static inline uint16_t mavlink_msg_watchdog_command_get_watchdog_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  1);
-}
-
-/**
- * @brief Get field process_id from watchdog_command message
- *
- * @return Process ID
- */
-static inline uint16_t mavlink_msg_watchdog_command_get_process_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  3);
-}
-
-/**
- * @brief Get field command_id from watchdog_command message
- *
- * @return Command ID
- */
-static inline uint8_t mavlink_msg_watchdog_command_get_command_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Decode a watchdog_command message into a struct
- *
- * @param msg The message to decode
- * @param watchdog_command C-struct to decode the message contents into
- */
-static inline void mavlink_msg_watchdog_command_decode(const mavlink_message_t* msg, mavlink_watchdog_command_t* watchdog_command)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	watchdog_command->target_system_id = mavlink_msg_watchdog_command_get_target_system_id(msg);
-	watchdog_command->watchdog_id = mavlink_msg_watchdog_command_get_watchdog_id(msg);
-	watchdog_command->process_id = mavlink_msg_watchdog_command_get_process_id(msg);
-	watchdog_command->command_id = mavlink_msg_watchdog_command_get_command_id(msg);
-#else
-	memcpy(watchdog_command, _MAV_PAYLOAD(msg), 6);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_heartbeat.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_heartbeat.h
deleted file mode 100644
index 6dbe21104..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_heartbeat.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE WATCHDOG_HEARTBEAT PACKING
-
-#define MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT 180
-
-typedef struct __mavlink_watchdog_heartbeat_t
-{
- uint16_t watchdog_id; ///< Watchdog ID
- uint16_t process_count; ///< Number of processes
-} mavlink_watchdog_heartbeat_t;
-
-#define MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT_LEN 4
-#define MAVLINK_MSG_ID_180_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_WATCHDOG_HEARTBEAT { \
-	"WATCHDOG_HEARTBEAT", \
-	2, \
-	{  { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_heartbeat_t, watchdog_id) }, \
-         { "process_count", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_heartbeat_t, process_count) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a watchdog_heartbeat message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param watchdog_id Watchdog ID
- * @param process_count Number of processes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_heartbeat_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t watchdog_id, uint16_t process_count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_count);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_watchdog_heartbeat_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_count = process_count;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a watchdog_heartbeat message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_id Watchdog ID
- * @param process_count Number of processes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_heartbeat_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t watchdog_id,uint16_t process_count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_count);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_watchdog_heartbeat_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_count = process_count;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a watchdog_heartbeat struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_heartbeat C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_watchdog_heartbeat_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_watchdog_heartbeat_t* watchdog_heartbeat)
-{
-	return mavlink_msg_watchdog_heartbeat_pack(system_id, component_id, msg, watchdog_heartbeat->watchdog_id, watchdog_heartbeat->process_count);
-}
-
-/**
- * @brief Send a watchdog_heartbeat message
- * @param chan MAVLink channel to send the message
- *
- * @param watchdog_id Watchdog ID
- * @param process_count Number of processes
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_watchdog_heartbeat_send(mavlink_channel_t chan, uint16_t watchdog_id, uint16_t process_count)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_count);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, buf, 4);
-#else
-	mavlink_watchdog_heartbeat_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_count = process_count;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE WATCHDOG_HEARTBEAT UNPACKING
-
-
-/**
- * @brief Get field watchdog_id from watchdog_heartbeat message
- *
- * @return Watchdog ID
- */
-static inline uint16_t mavlink_msg_watchdog_heartbeat_get_watchdog_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field process_count from watchdog_heartbeat message
- *
- * @return Number of processes
- */
-static inline uint16_t mavlink_msg_watchdog_heartbeat_get_process_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a watchdog_heartbeat message into a struct
- *
- * @param msg The message to decode
- * @param watchdog_heartbeat C-struct to decode the message contents into
- */
-static inline void mavlink_msg_watchdog_heartbeat_decode(const mavlink_message_t* msg, mavlink_watchdog_heartbeat_t* watchdog_heartbeat)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	watchdog_heartbeat->watchdog_id = mavlink_msg_watchdog_heartbeat_get_watchdog_id(msg);
-	watchdog_heartbeat->process_count = mavlink_msg_watchdog_heartbeat_get_process_count(msg);
-#else
-	memcpy(watchdog_heartbeat, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_info.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_info.h
deleted file mode 100644
index 42e896692..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_info.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// MESSAGE WATCHDOG_PROCESS_INFO PACKING
-
-#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO 181
-
-typedef struct __mavlink_watchdog_process_info_t
-{
- uint16_t watchdog_id; ///< Watchdog ID
- uint16_t process_id; ///< Process ID
- char name[100]; ///< Process name
- char arguments[147]; ///< Process arguments
- int32_t timeout; ///< Timeout (seconds)
-} mavlink_watchdog_process_info_t;
-
-#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO_LEN 255
-#define MAVLINK_MSG_ID_181_LEN 255
-
-#define MAVLINK_MSG_WATCHDOG_PROCESS_INFO_FIELD_NAME_LEN 100
-#define MAVLINK_MSG_WATCHDOG_PROCESS_INFO_FIELD_ARGUMENTS_LEN 147
-
-#define MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_INFO { \
-	"WATCHDOG_PROCESS_INFO", \
-	5, \
-	{  { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_process_info_t, watchdog_id) }, \
-         { "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_process_info_t, process_id) }, \
-         { "name", NULL, MAVLINK_TYPE_CHAR, 100, 4, offsetof(mavlink_watchdog_process_info_t, name) }, \
-         { "arguments", NULL, MAVLINK_TYPE_CHAR, 147, 104, offsetof(mavlink_watchdog_process_info_t, arguments) }, \
-         { "timeout", NULL, MAVLINK_TYPE_INT32_T, 0, 251, offsetof(mavlink_watchdog_process_info_t, timeout) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a watchdog_process_info message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param name Process name
- * @param arguments Process arguments
- * @param timeout Timeout (seconds)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t watchdog_id, uint16_t process_id, const char *name, const char *arguments, int32_t timeout)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_int32_t(buf, 251, timeout);
-	_mav_put_char_array(buf, 4, name, 100);
-	_mav_put_char_array(buf, 104, arguments, 147);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
-#else
-	mavlink_watchdog_process_info_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.timeout = timeout;
-	mav_array_memcpy(packet.name, name, sizeof(char)*100);
-	mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO;
-	return mavlink_finalize_message(msg, system_id, component_id, 255);
-}
-
-/**
- * @brief Pack a watchdog_process_info message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param name Process name
- * @param arguments Process arguments
- * @param timeout Timeout (seconds)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t watchdog_id,uint16_t process_id,const char *name,const char *arguments,int32_t timeout)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_int32_t(buf, 251, timeout);
-	_mav_put_char_array(buf, 4, name, 100);
-	_mav_put_char_array(buf, 104, arguments, 147);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
-#else
-	mavlink_watchdog_process_info_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.timeout = timeout;
-	mav_array_memcpy(packet.name, name, sizeof(char)*100);
-	mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255);
-}
-
-/**
- * @brief Encode a watchdog_process_info struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_process_info C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_watchdog_process_info_t* watchdog_process_info)
-{
-	return mavlink_msg_watchdog_process_info_pack(system_id, component_id, msg, watchdog_process_info->watchdog_id, watchdog_process_info->process_id, watchdog_process_info->name, watchdog_process_info->arguments, watchdog_process_info->timeout);
-}
-
-/**
- * @brief Send a watchdog_process_info message
- * @param chan MAVLink channel to send the message
- *
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param name Process name
- * @param arguments Process arguments
- * @param timeout Timeout (seconds)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_watchdog_process_info_send(mavlink_channel_t chan, uint16_t watchdog_id, uint16_t process_id, const char *name, const char *arguments, int32_t timeout)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[255];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_int32_t(buf, 251, timeout);
-	_mav_put_char_array(buf, 4, name, 100);
-	_mav_put_char_array(buf, 104, arguments, 147);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, buf, 255);
-#else
-	mavlink_watchdog_process_info_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.timeout = timeout;
-	mav_array_memcpy(packet.name, name, sizeof(char)*100);
-	mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, (const char *)&packet, 255);
-#endif
-}
-
-#endif
-
-// MESSAGE WATCHDOG_PROCESS_INFO UNPACKING
-
-
-/**
- * @brief Get field watchdog_id from watchdog_process_info message
- *
- * @return Watchdog ID
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_get_watchdog_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field process_id from watchdog_process_info message
- *
- * @return Process ID
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_get_process_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field name from watchdog_process_info message
- *
- * @return Process name
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_get_name(const mavlink_message_t* msg, char *name)
-{
-	return _MAV_RETURN_char_array(msg, name, 100,  4);
-}
-
-/**
- * @brief Get field arguments from watchdog_process_info message
- *
- * @return Process arguments
- */
-static inline uint16_t mavlink_msg_watchdog_process_info_get_arguments(const mavlink_message_t* msg, char *arguments)
-{
-	return _MAV_RETURN_char_array(msg, arguments, 147,  104);
-}
-
-/**
- * @brief Get field timeout from watchdog_process_info message
- *
- * @return Timeout (seconds)
- */
-static inline int32_t mavlink_msg_watchdog_process_info_get_timeout(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  251);
-}
-
-/**
- * @brief Decode a watchdog_process_info message into a struct
- *
- * @param msg The message to decode
- * @param watchdog_process_info C-struct to decode the message contents into
- */
-static inline void mavlink_msg_watchdog_process_info_decode(const mavlink_message_t* msg, mavlink_watchdog_process_info_t* watchdog_process_info)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	watchdog_process_info->watchdog_id = mavlink_msg_watchdog_process_info_get_watchdog_id(msg);
-	watchdog_process_info->process_id = mavlink_msg_watchdog_process_info_get_process_id(msg);
-	mavlink_msg_watchdog_process_info_get_name(msg, watchdog_process_info->name);
-	mavlink_msg_watchdog_process_info_get_arguments(msg, watchdog_process_info->arguments);
-	watchdog_process_info->timeout = mavlink_msg_watchdog_process_info_get_timeout(msg);
-#else
-	memcpy(watchdog_process_info, _MAV_PAYLOAD(msg), 255);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_status.h b/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_status.h
deleted file mode 100644
index de5c7b2b2..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_status.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE WATCHDOG_PROCESS_STATUS PACKING
-
-#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS 182
-
-typedef struct __mavlink_watchdog_process_status_t
-{
- uint16_t watchdog_id; ///< Watchdog ID
- uint16_t process_id; ///< Process ID
- uint8_t state; ///< Is running / finished / suspended / crashed
- uint8_t muted; ///< Is muted
- int32_t pid; ///< PID
- uint16_t crashes; ///< Number of crashes
-} mavlink_watchdog_process_status_t;
-
-#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS_LEN 12
-#define MAVLINK_MSG_ID_182_LEN 12
-
-
-
-#define MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_STATUS { \
-	"WATCHDOG_PROCESS_STATUS", \
-	6, \
-	{  { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_process_status_t, watchdog_id) }, \
-         { "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_process_status_t, process_id) }, \
-         { "state", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_watchdog_process_status_t, state) }, \
-         { "muted", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_watchdog_process_status_t, muted) }, \
-         { "pid", NULL, MAVLINK_TYPE_INT32_T, 0, 6, offsetof(mavlink_watchdog_process_status_t, pid) }, \
-         { "crashes", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_watchdog_process_status_t, crashes) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a watchdog_process_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param state Is running / finished / suspended / crashed
- * @param muted Is muted
- * @param pid PID
- * @param crashes Number of crashes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint16_t watchdog_id, uint16_t process_id, uint8_t state, uint8_t muted, int32_t pid, uint16_t crashes)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_uint8_t(buf, 4, state);
-	_mav_put_uint8_t(buf, 5, muted);
-	_mav_put_int32_t(buf, 6, pid);
-	_mav_put_uint16_t(buf, 10, crashes);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_watchdog_process_status_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.state = state;
-	packet.muted = muted;
-	packet.pid = pid;
-	packet.crashes = crashes;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 12);
-}
-
-/**
- * @brief Pack a watchdog_process_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param state Is running / finished / suspended / crashed
- * @param muted Is muted
- * @param pid PID
- * @param crashes Number of crashes
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint16_t watchdog_id,uint16_t process_id,uint8_t state,uint8_t muted,int32_t pid,uint16_t crashes)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_uint8_t(buf, 4, state);
-	_mav_put_uint8_t(buf, 5, muted);
-	_mav_put_int32_t(buf, 6, pid);
-	_mav_put_uint16_t(buf, 10, crashes);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
-#else
-	mavlink_watchdog_process_status_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.state = state;
-	packet.muted = muted;
-	packet.pid = pid;
-	packet.crashes = crashes;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12);
-}
-
-/**
- * @brief Encode a watchdog_process_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param watchdog_process_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_watchdog_process_status_t* watchdog_process_status)
-{
-	return mavlink_msg_watchdog_process_status_pack(system_id, component_id, msg, watchdog_process_status->watchdog_id, watchdog_process_status->process_id, watchdog_process_status->state, watchdog_process_status->muted, watchdog_process_status->pid, watchdog_process_status->crashes);
-}
-
-/**
- * @brief Send a watchdog_process_status message
- * @param chan MAVLink channel to send the message
- *
- * @param watchdog_id Watchdog ID
- * @param process_id Process ID
- * @param state Is running / finished / suspended / crashed
- * @param muted Is muted
- * @param pid PID
- * @param crashes Number of crashes
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_watchdog_process_status_send(mavlink_channel_t chan, uint16_t watchdog_id, uint16_t process_id, uint8_t state, uint8_t muted, int32_t pid, uint16_t crashes)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_uint16_t(buf, 0, watchdog_id);
-	_mav_put_uint16_t(buf, 2, process_id);
-	_mav_put_uint8_t(buf, 4, state);
-	_mav_put_uint8_t(buf, 5, muted);
-	_mav_put_int32_t(buf, 6, pid);
-	_mav_put_uint16_t(buf, 10, crashes);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, buf, 12);
-#else
-	mavlink_watchdog_process_status_t packet;
-	packet.watchdog_id = watchdog_id;
-	packet.process_id = process_id;
-	packet.state = state;
-	packet.muted = muted;
-	packet.pid = pid;
-	packet.crashes = crashes;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, (const char *)&packet, 12);
-#endif
-}
-
-#endif
-
-// MESSAGE WATCHDOG_PROCESS_STATUS UNPACKING
-
-
-/**
- * @brief Get field watchdog_id from watchdog_process_status message
- *
- * @return Watchdog ID
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_get_watchdog_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Get field process_id from watchdog_process_status message
- *
- * @return Process ID
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_get_process_id(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Get field state from watchdog_process_status message
- *
- * @return Is running / finished / suspended / crashed
- */
-static inline uint8_t mavlink_msg_watchdog_process_status_get_state(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field muted from watchdog_process_status message
- *
- * @return Is muted
- */
-static inline uint8_t mavlink_msg_watchdog_process_status_get_muted(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field pid from watchdog_process_status message
- *
- * @return PID
- */
-static inline int32_t mavlink_msg_watchdog_process_status_get_pid(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  6);
-}
-
-/**
- * @brief Get field crashes from watchdog_process_status message
- *
- * @return Number of crashes
- */
-static inline uint16_t mavlink_msg_watchdog_process_status_get_crashes(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  10);
-}
-
-/**
- * @brief Decode a watchdog_process_status message into a struct
- *
- * @param msg The message to decode
- * @param watchdog_process_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_watchdog_process_status_decode(const mavlink_message_t* msg, mavlink_watchdog_process_status_t* watchdog_process_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	watchdog_process_status->watchdog_id = mavlink_msg_watchdog_process_status_get_watchdog_id(msg);
-	watchdog_process_status->process_id = mavlink_msg_watchdog_process_status_get_process_id(msg);
-	watchdog_process_status->state = mavlink_msg_watchdog_process_status_get_state(msg);
-	watchdog_process_status->muted = mavlink_msg_watchdog_process_status_get_muted(msg);
-	watchdog_process_status->pid = mavlink_msg_watchdog_process_status_get_pid(msg);
-	watchdog_process_status->crashes = mavlink_msg_watchdog_process_status_get_crashes(msg);
-#else
-	memcpy(watchdog_process_status, _MAV_PAYLOAD(msg), 12);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/pixhawk.h b/mavlink/include/mavlink/v0.9/pixhawk/pixhawk.h
deleted file mode 100644
index feb759ef9..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/pixhawk.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from pixhawk.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef PIXHAWK_H
-#define PIXHAWK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 4, 8, 14, 8, 28, 3, 32, 0, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 19, 2, 23, 21, 0, 37, 26, 101, 26, 16, 32, 32, 37, 32, 11, 17, 17, 16, 18, 36, 4, 4, 2, 2, 4, 2, 2, 3, 14, 12, 18, 16, 8, 27, 25, 18, 18, 24, 24, 0, 0, 0, 26, 16, 36, 5, 6, 56, 26, 21, 18, 0, 0, 18, 20, 20, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 52, 1, 92, 0, 32, 32, 20, 20, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 16, 0, 0, 0, 0, 0, 0, 0, 4, 255, 12, 6, 0, 0, 0, 0, 0, 0, 106, 43, 55, 8, 255, 53, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 14, 14, 51, 5}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 39, 190, 92, 191, 217, 104, 119, 0, 219, 60, 186, 10, 0, 0, 0, 0, 0, 0, 0, 89, 159, 162, 121, 0, 149, 222, 110, 179, 136, 66, 126, 185, 147, 112, 252, 162, 215, 229, 128, 9, 106, 101, 213, 4, 229, 21, 214, 215, 14, 206, 50, 157, 126, 108, 213, 95, 5, 127, 0, 0, 0, 57, 126, 130, 119, 193, 191, 236, 158, 143, 0, 0, 104, 123, 131, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 86, 95, 49, 0, 158, 56, 208, 218, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 136, 140, 0, 0, 0, 0, 0, 0, 0, 153, 110, 92, 188, 0, 0, 0, 0, 0, 0, 106, 154, 83, 98, 223, 254, 0, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 224, 60, 106, 7}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_BOOT, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACTION_ACK, MAVLINK_MESSAGE_INFO_ACTION, MAVLINK_MESSAGE_INFO_SET_MODE, MAVLINK_MESSAGE_INFO_SET_NAV_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_LOCAL_POSITION, MAVLINK_MESSAGE_INFO_GPS_RAW, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_WAYPOINT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST, MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST, MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT, MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL, MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED, MAVLINK_MESSAGE_INFO_WAYPOINT_ACK, MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_CONTROL_STATUS, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_POSITION_TARGET, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, MAVLINK_MESSAGE_INFO_SET_ALTITUDE, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_VFR_HUD, MAVLINK_MESSAGE_INFO_COMMAND, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_CAM_SHUTTER, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGERED, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGER_CONTROL, MAVLINK_MESSAGE_INFO_IMAGE_AVAILABLE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT_SET, MAVLINK_MESSAGE_INFO_POSITION_CONTROL_OFFSET_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT, MAVLINK_MESSAGE_INFO_MARKER, MAVLINK_MESSAGE_INFO_RAW_AUX, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_WATCHDOG_HEARTBEAT, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_INFO, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_STATUS, MAVLINK_MESSAGE_INFO_WATCHDOG_COMMAND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PATTERN_DETECTED, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST_CONNECTION, MAVLINK_MESSAGE_INFO_DATA_TRANSMISSION_HANDSHAKE, MAVLINK_MESSAGE_INFO_ENCAPSULATED_DATA, MAVLINK_MESSAGE_INFO_BRIEF_FEATURE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ATTITUDE_CONTROL, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_PIXHAWK
-
-#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
-
-
-/** @brief Content Types for data transmission handshake */
-#ifndef HAVE_ENUM_DATA_TYPES
-#define HAVE_ENUM_DATA_TYPES
-enum DATA_TYPES
-{
-	DATA_TYPE_JPEG_IMAGE=1, /*  | */
-	DATA_TYPE_RAW_IMAGE=2, /*  | */
-	DATA_TYPE_KINECT=3, /*  | */
-	DATA_TYPES_ENUM_END=4, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_set_cam_shutter.h"
-#include "./mavlink_msg_image_triggered.h"
-#include "./mavlink_msg_image_trigger_control.h"
-#include "./mavlink_msg_image_available.h"
-#include "./mavlink_msg_vision_position_estimate.h"
-#include "./mavlink_msg_vicon_position_estimate.h"
-#include "./mavlink_msg_vision_speed_estimate.h"
-#include "./mavlink_msg_position_control_setpoint_set.h"
-#include "./mavlink_msg_position_control_offset_set.h"
-#include "./mavlink_msg_position_control_setpoint.h"
-#include "./mavlink_msg_marker.h"
-#include "./mavlink_msg_raw_aux.h"
-#include "./mavlink_msg_watchdog_heartbeat.h"
-#include "./mavlink_msg_watchdog_process_info.h"
-#include "./mavlink_msg_watchdog_process_status.h"
-#include "./mavlink_msg_watchdog_command.h"
-#include "./mavlink_msg_pattern_detected.h"
-#include "./mavlink_msg_point_of_interest.h"
-#include "./mavlink_msg_point_of_interest_connection.h"
-#include "./mavlink_msg_data_transmission_handshake.h"
-#include "./mavlink_msg_encapsulated_data.h"
-#include "./mavlink_msg_brief_feature.h"
-#include "./mavlink_msg_attitude_control.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // PIXHAWK_H
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/testsuite.h b/mavlink/include/mavlink/v0.9/pixhawk/testsuite.h
deleted file mode 100644
index 3e18abc82..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/testsuite.h
+++ /dev/null
@@ -1,1312 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from pixhawk.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef PIXHAWK_TESTSUITE_H
-#define PIXHAWK_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_pixhawk(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_pixhawk(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_set_cam_shutter(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_set_cam_shutter_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	17495,
-	66.0,
-	};
-	mavlink_set_cam_shutter_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.cam_no = packet_in.cam_no;
-        	packet1.cam_mode = packet_in.cam_mode;
-        	packet1.trigger_pin = packet_in.trigger_pin;
-        	packet1.interval = packet_in.interval;
-        	packet1.exposure = packet_in.exposure;
-        	packet1.gain = packet_in.gain;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_cam_shutter_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_set_cam_shutter_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_cam_shutter_pack(system_id, component_id, &msg , packet1.cam_no , packet1.cam_mode , packet1.trigger_pin , packet1.interval , packet1.exposure , packet1.gain );
-	mavlink_msg_set_cam_shutter_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_cam_shutter_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.cam_no , packet1.cam_mode , packet1.trigger_pin , packet1.interval , packet1.exposure , packet1.gain );
-	mavlink_msg_set_cam_shutter_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_set_cam_shutter_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_cam_shutter_send(MAVLINK_COMM_1 , packet1.cam_no , packet1.cam_mode , packet1.trigger_pin , packet1.interval , packet1.exposure , packet1.gain );
-	mavlink_msg_set_cam_shutter_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_image_triggered(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_image_triggered_t packet_in = {
-		93372036854775807ULL,
-	963497880,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	241.0,
-	269.0,
-	297.0,
-	325.0,
-	353.0,
-	};
-	mavlink_image_triggered_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.timestamp = packet_in.timestamp;
-        	packet1.seq = packet_in.seq;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.local_z = packet_in.local_z;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.ground_x = packet_in.ground_x;
-        	packet1.ground_y = packet_in.ground_y;
-        	packet1.ground_z = packet_in.ground_z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_triggered_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_image_triggered_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_triggered_pack(system_id, component_id, &msg , packet1.timestamp , packet1.seq , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_triggered_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_triggered_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.seq , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_triggered_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_image_triggered_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_triggered_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.seq , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_triggered_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_image_trigger_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_image_trigger_control_t packet_in = {
-		5,
-	};
-	mavlink_image_trigger_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.enable = packet_in.enable;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_trigger_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_image_trigger_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_trigger_control_pack(system_id, component_id, &msg , packet1.enable );
-	mavlink_msg_image_trigger_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_trigger_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.enable );
-	mavlink_msg_image_trigger_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_image_trigger_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_trigger_control_send(MAVLINK_COMM_1 , packet1.enable );
-	mavlink_msg_image_trigger_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_image_available(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_image_available_t packet_in = {
-		93372036854775807ULL,
-	29,
-	93372036854776374ULL,
-	93372036854776878ULL,
-	963498764,
-	963498972,
-	18951,
-	19055,
-	19159,
-	58,
-	963499544,
-	963499752,
-	353.0,
-	381.0,
-	409.0,
-	437.0,
-	465.0,
-	493.0,
-	521.0,
-	549.0,
-	577.0,
-	605.0,
-	633.0,
-	};
-	mavlink_image_available_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.cam_id = packet_in.cam_id;
-        	packet1.cam_no = packet_in.cam_no;
-        	packet1.timestamp = packet_in.timestamp;
-        	packet1.valid_until = packet_in.valid_until;
-        	packet1.img_seq = packet_in.img_seq;
-        	packet1.img_buf_index = packet_in.img_buf_index;
-        	packet1.width = packet_in.width;
-        	packet1.height = packet_in.height;
-        	packet1.depth = packet_in.depth;
-        	packet1.channels = packet_in.channels;
-        	packet1.key = packet_in.key;
-        	packet1.exposure = packet_in.exposure;
-        	packet1.gain = packet_in.gain;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.local_z = packet_in.local_z;
-        	packet1.lat = packet_in.lat;
-        	packet1.lon = packet_in.lon;
-        	packet1.alt = packet_in.alt;
-        	packet1.ground_x = packet_in.ground_x;
-        	packet1.ground_y = packet_in.ground_y;
-        	packet1.ground_z = packet_in.ground_z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_available_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_image_available_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_available_pack(system_id, component_id, &msg , packet1.cam_id , packet1.cam_no , packet1.timestamp , packet1.valid_until , packet1.img_seq , packet1.img_buf_index , packet1.width , packet1.height , packet1.depth , packet1.channels , packet1.key , packet1.exposure , packet1.gain , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_available_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_available_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.cam_id , packet1.cam_no , packet1.timestamp , packet1.valid_until , packet1.img_seq , packet1.img_buf_index , packet1.width , packet1.height , packet1.depth , packet1.channels , packet1.key , packet1.exposure , packet1.gain , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_available_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_image_available_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_image_available_send(MAVLINK_COMM_1 , packet1.cam_id , packet1.cam_no , packet1.timestamp , packet1.valid_until , packet1.img_seq , packet1.img_buf_index , packet1.width , packet1.height , packet1.depth , packet1.channels , packet1.key , packet1.exposure , packet1.gain , packet1.roll , packet1.pitch , packet1.yaw , packet1.local_z , packet1.lat , packet1.lon , packet1.alt , packet1.ground_x , packet1.ground_y , packet1.ground_z );
-	mavlink_msg_image_available_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_vision_position_estimate(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_vision_position_estimate_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_vision_position_estimate_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_position_estimate_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_vision_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_position_estimate_pack(system_id, component_id, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vision_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_position_estimate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vision_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_vision_position_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_position_estimate_send(MAVLINK_COMM_1 , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vision_position_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_vicon_position_estimate(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_vicon_position_estimate_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_vicon_position_estimate_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vicon_position_estimate_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_vicon_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vicon_position_estimate_pack(system_id, component_id, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vicon_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vicon_position_estimate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vicon_position_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_vicon_position_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vicon_position_estimate_send(MAVLINK_COMM_1 , packet1.usec , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_vicon_position_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_vision_speed_estimate(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_vision_speed_estimate_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	};
-	mavlink_vision_speed_estimate_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_speed_estimate_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_vision_speed_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_speed_estimate_pack(system_id, component_id, &msg , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_vision_speed_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_speed_estimate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_vision_speed_estimate_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_vision_speed_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_vision_speed_estimate_send(MAVLINK_COMM_1 , packet1.usec , packet1.x , packet1.y , packet1.z );
-	mavlink_msg_vision_speed_estimate_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_position_control_setpoint_set(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_position_control_setpoint_set_t packet_in = {
-		5,
-	72,
-	17339,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	};
-	mavlink_position_control_setpoint_set_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.id = packet_in.id;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_set_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_position_control_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_set_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_set_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_position_control_setpoint_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_set_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_position_control_offset_set(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_position_control_offset_set_t packet_in = {
-		5,
-	72,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	};
-	mavlink_position_control_offset_set_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system = packet_in.target_system;
-        	packet1.target_component = packet_in.target_component;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_offset_set_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_position_control_offset_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_offset_set_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_offset_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_offset_set_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_offset_set_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_position_control_offset_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_offset_set_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_offset_set_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_position_control_setpoint(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_position_control_setpoint_t packet_in = {
-		17235,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	};
-	mavlink_position_control_setpoint_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.id = packet_in.id;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_position_control_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_pack(system_id, component_id, &msg , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_position_control_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_position_control_setpoint_send(MAVLINK_COMM_1 , packet1.id , packet1.x , packet1.y , packet1.z , packet1.yaw );
-	mavlink_msg_position_control_setpoint_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_marker(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_marker_t packet_in = {
-		17235,
-	31.0,
-	59.0,
-	87.0,
-	115.0,
-	143.0,
-	171.0,
-	};
-	mavlink_marker_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.id = packet_in.id;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_marker_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_marker_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_marker_pack(system_id, component_id, &msg , packet1.id , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_marker_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_marker_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.id , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_marker_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_marker_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_marker_send(MAVLINK_COMM_1 , packet1.id , packet1.x , packet1.y , packet1.z , packet1.roll , packet1.pitch , packet1.yaw );
-	mavlink_msg_marker_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_raw_aux(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_raw_aux_t packet_in = {
-		17235,
-	17339,
-	17443,
-	17547,
-	17651,
-	17755,
-	963498088,
-	};
-	mavlink_raw_aux_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.adc1 = packet_in.adc1;
-        	packet1.adc2 = packet_in.adc2;
-        	packet1.adc3 = packet_in.adc3;
-        	packet1.adc4 = packet_in.adc4;
-        	packet1.vbat = packet_in.vbat;
-        	packet1.temp = packet_in.temp;
-        	packet1.baro = packet_in.baro;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_aux_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_raw_aux_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_aux_pack(system_id, component_id, &msg , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.vbat , packet1.temp , packet1.baro );
-	mavlink_msg_raw_aux_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_aux_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.vbat , packet1.temp , packet1.baro );
-	mavlink_msg_raw_aux_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_raw_aux_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_raw_aux_send(MAVLINK_COMM_1 , packet1.adc1 , packet1.adc2 , packet1.adc3 , packet1.adc4 , packet1.vbat , packet1.temp , packet1.baro );
-	mavlink_msg_raw_aux_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_watchdog_heartbeat(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_watchdog_heartbeat_t packet_in = {
-		17235,
-	17339,
-	};
-	mavlink_watchdog_heartbeat_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.watchdog_id = packet_in.watchdog_id;
-        	packet1.process_count = packet_in.process_count;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_heartbeat_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_watchdog_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_heartbeat_pack(system_id, component_id, &msg , packet1.watchdog_id , packet1.process_count );
-	mavlink_msg_watchdog_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_heartbeat_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.watchdog_id , packet1.process_count );
-	mavlink_msg_watchdog_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_watchdog_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_heartbeat_send(MAVLINK_COMM_1 , packet1.watchdog_id , packet1.process_count );
-	mavlink_msg_watchdog_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_watchdog_process_info(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_watchdog_process_info_t packet_in = {
-		17235,
-	17339,
-	"EFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXY",
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP",
-	963510516,
-	};
-	mavlink_watchdog_process_info_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.watchdog_id = packet_in.watchdog_id;
-        	packet1.process_id = packet_in.process_id;
-        	packet1.timeout = packet_in.timeout;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*100);
-        	mav_array_memcpy(packet1.arguments, packet_in.arguments, sizeof(char)*147);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_info_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_watchdog_process_info_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_info_pack(system_id, component_id, &msg , packet1.watchdog_id , packet1.process_id , packet1.name , packet1.arguments , packet1.timeout );
-	mavlink_msg_watchdog_process_info_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_info_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.watchdog_id , packet1.process_id , packet1.name , packet1.arguments , packet1.timeout );
-	mavlink_msg_watchdog_process_info_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_watchdog_process_info_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_info_send(MAVLINK_COMM_1 , packet1.watchdog_id , packet1.process_id , packet1.name , packet1.arguments , packet1.timeout );
-	mavlink_msg_watchdog_process_info_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_watchdog_process_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_watchdog_process_status_t packet_in = {
-		17235,
-	17339,
-	17,
-	84,
-	963497776,
-	17755,
-	};
-	mavlink_watchdog_process_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.watchdog_id = packet_in.watchdog_id;
-        	packet1.process_id = packet_in.process_id;
-        	packet1.state = packet_in.state;
-        	packet1.muted = packet_in.muted;
-        	packet1.pid = packet_in.pid;
-        	packet1.crashes = packet_in.crashes;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_watchdog_process_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_status_pack(system_id, component_id, &msg , packet1.watchdog_id , packet1.process_id , packet1.state , packet1.muted , packet1.pid , packet1.crashes );
-	mavlink_msg_watchdog_process_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.watchdog_id , packet1.process_id , packet1.state , packet1.muted , packet1.pid , packet1.crashes );
-	mavlink_msg_watchdog_process_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_watchdog_process_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_process_status_send(MAVLINK_COMM_1 , packet1.watchdog_id , packet1.process_id , packet1.state , packet1.muted , packet1.pid , packet1.crashes );
-	mavlink_msg_watchdog_process_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_watchdog_command(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_watchdog_command_t packet_in = {
-		5,
-	17287,
-	17391,
-	84,
-	};
-	mavlink_watchdog_command_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target_system_id = packet_in.target_system_id;
-        	packet1.watchdog_id = packet_in.watchdog_id;
-        	packet1.process_id = packet_in.process_id;
-        	packet1.command_id = packet_in.command_id;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_command_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_watchdog_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_command_pack(system_id, component_id, &msg , packet1.target_system_id , packet1.watchdog_id , packet1.process_id , packet1.command_id );
-	mavlink_msg_watchdog_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_command_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system_id , packet1.watchdog_id , packet1.process_id , packet1.command_id );
-	mavlink_msg_watchdog_command_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_watchdog_command_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_watchdog_command_send(MAVLINK_COMM_1 , packet1.target_system_id , packet1.watchdog_id , packet1.process_id , packet1.command_id );
-	mavlink_msg_watchdog_command_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_pattern_detected(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_pattern_detected_t packet_in = {
-		5,
-	24.0,
-	"FGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ",
-	128,
-	};
-	mavlink_pattern_detected_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.confidence = packet_in.confidence;
-        	packet1.detected = packet_in.detected;
-        
-        	mav_array_memcpy(packet1.file, packet_in.file, sizeof(char)*100);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_pattern_detected_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_pattern_detected_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_pattern_detected_pack(system_id, component_id, &msg , packet1.type , packet1.confidence , packet1.file , packet1.detected );
-	mavlink_msg_pattern_detected_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_pattern_detected_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.confidence , packet1.file , packet1.detected );
-	mavlink_msg_pattern_detected_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_pattern_detected_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_pattern_detected_send(MAVLINK_COMM_1 , packet1.type , packet1.confidence , packet1.file , packet1.detected );
-	mavlink_msg_pattern_detected_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_point_of_interest(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_point_of_interest_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	52.0,
-	80.0,
-	108.0,
-	"RSTUVWXYZABCDEFGHIJKLMNOP",
-	};
-	mavlink_point_of_interest_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.color = packet_in.color;
-        	packet1.coordinate_system = packet_in.coordinate_system;
-        	packet1.timeout = packet_in.timeout;
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*26);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_point_of_interest_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_pack(system_id, component_id, &msg , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.x , packet1.y , packet1.z , packet1.name );
-	mavlink_msg_point_of_interest_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.x , packet1.y , packet1.z , packet1.name );
-	mavlink_msg_point_of_interest_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_point_of_interest_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_send(MAVLINK_COMM_1 , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.x , packet1.y , packet1.z , packet1.name );
-	mavlink_msg_point_of_interest_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_point_of_interest_connection(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_point_of_interest_connection_t packet_in = {
-		5,
-	72,
-	139,
-	17391,
-	52.0,
-	80.0,
-	108.0,
-	136.0,
-	164.0,
-	192.0,
-	"DEFGHIJKLMNOPQRSTUVWXYZAB",
-	};
-	mavlink_point_of_interest_connection_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.color = packet_in.color;
-        	packet1.coordinate_system = packet_in.coordinate_system;
-        	packet1.timeout = packet_in.timeout;
-        	packet1.xp1 = packet_in.xp1;
-        	packet1.yp1 = packet_in.yp1;
-        	packet1.zp1 = packet_in.zp1;
-        	packet1.xp2 = packet_in.xp2;
-        	packet1.yp2 = packet_in.yp2;
-        	packet1.zp2 = packet_in.zp2;
-        
-        	mav_array_memcpy(packet1.name, packet_in.name, sizeof(char)*26);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_connection_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_point_of_interest_connection_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_connection_pack(system_id, component_id, &msg , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.xp1 , packet1.yp1 , packet1.zp1 , packet1.xp2 , packet1.yp2 , packet1.zp2 , packet1.name );
-	mavlink_msg_point_of_interest_connection_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_connection_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.xp1 , packet1.yp1 , packet1.zp1 , packet1.xp2 , packet1.yp2 , packet1.zp2 , packet1.name );
-	mavlink_msg_point_of_interest_connection_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_point_of_interest_connection_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_point_of_interest_connection_send(MAVLINK_COMM_1 , packet1.type , packet1.color , packet1.coordinate_system , packet1.timeout , packet1.xp1 , packet1.yp1 , packet1.zp1 , packet1.xp2 , packet1.yp2 , packet1.zp2 , packet1.name );
-	mavlink_msg_point_of_interest_connection_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_data_transmission_handshake(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_data_transmission_handshake_t packet_in = {
-		5,
-	963497516,
-	84,
-	151,
-	218,
-	};
-	mavlink_data_transmission_handshake_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.type = packet_in.type;
-        	packet1.size = packet_in.size;
-        	packet1.packets = packet_in.packets;
-        	packet1.payload = packet_in.payload;
-        	packet1.jpg_quality = packet_in.jpg_quality;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_transmission_handshake_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_data_transmission_handshake_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_transmission_handshake_pack(system_id, component_id, &msg , packet1.type , packet1.size , packet1.packets , packet1.payload , packet1.jpg_quality );
-	mavlink_msg_data_transmission_handshake_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_transmission_handshake_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.size , packet1.packets , packet1.payload , packet1.jpg_quality );
-	mavlink_msg_data_transmission_handshake_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_data_transmission_handshake_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_transmission_handshake_send(MAVLINK_COMM_1 , packet1.type , packet1.size , packet1.packets , packet1.payload , packet1.jpg_quality );
-	mavlink_msg_data_transmission_handshake_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_encapsulated_data(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_encapsulated_data_t packet_in = {
-		17235,
-	{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135 },
-	};
-	mavlink_encapsulated_data_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.seqnr = packet_in.seqnr;
-        
-        	mav_array_memcpy(packet1.data, packet_in.data, sizeof(uint8_t)*253);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_encapsulated_data_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_encapsulated_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_encapsulated_data_pack(system_id, component_id, &msg , packet1.seqnr , packet1.data );
-	mavlink_msg_encapsulated_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_encapsulated_data_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.seqnr , packet1.data );
-	mavlink_msg_encapsulated_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_encapsulated_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_encapsulated_data_send(MAVLINK_COMM_1 , packet1.seqnr , packet1.data );
-	mavlink_msg_encapsulated_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_brief_feature(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_brief_feature_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	41,
-	17911,
-	18015,
-	{ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151 },
-	360.0,
-	};
-	mavlink_brief_feature_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.x = packet_in.x;
-        	packet1.y = packet_in.y;
-        	packet1.z = packet_in.z;
-        	packet1.orientation_assignment = packet_in.orientation_assignment;
-        	packet1.size = packet_in.size;
-        	packet1.orientation = packet_in.orientation;
-        	packet1.response = packet_in.response;
-        
-        	mav_array_memcpy(packet1.descriptor, packet_in.descriptor, sizeof(uint8_t)*32);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_brief_feature_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_brief_feature_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_brief_feature_pack(system_id, component_id, &msg , packet1.x , packet1.y , packet1.z , packet1.orientation_assignment , packet1.size , packet1.orientation , packet1.descriptor , packet1.response );
-	mavlink_msg_brief_feature_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_brief_feature_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.x , packet1.y , packet1.z , packet1.orientation_assignment , packet1.size , packet1.orientation , packet1.descriptor , packet1.response );
-	mavlink_msg_brief_feature_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_brief_feature_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_brief_feature_send(MAVLINK_COMM_1 , packet1.x , packet1.y , packet1.z , packet1.orientation_assignment , packet1.size , packet1.orientation , packet1.descriptor , packet1.response );
-	mavlink_msg_brief_feature_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_attitude_control(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_attitude_control_t packet_in = {
-		5,
-	24.0,
-	52.0,
-	80.0,
-	108.0,
-	120,
-	187,
-	254,
-	65,
-	};
-	mavlink_attitude_control_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.roll = packet_in.roll;
-        	packet1.pitch = packet_in.pitch;
-        	packet1.yaw = packet_in.yaw;
-        	packet1.thrust = packet_in.thrust;
-        	packet1.roll_manual = packet_in.roll_manual;
-        	packet1.pitch_manual = packet_in.pitch_manual;
-        	packet1.yaw_manual = packet_in.yaw_manual;
-        	packet1.thrust_manual = packet_in.thrust_manual;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_control_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_attitude_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_control_pack(system_id, component_id, &msg , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_attitude_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_control_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_attitude_control_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_attitude_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_attitude_control_send(MAVLINK_COMM_1 , packet1.target , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust , packet1.roll_manual , packet1.pitch_manual , packet1.yaw_manual , packet1.thrust_manual );
-	mavlink_msg_attitude_control_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_pixhawk(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_set_cam_shutter(system_id, component_id, last_msg);
-	mavlink_test_image_triggered(system_id, component_id, last_msg);
-	mavlink_test_image_trigger_control(system_id, component_id, last_msg);
-	mavlink_test_image_available(system_id, component_id, last_msg);
-	mavlink_test_vision_position_estimate(system_id, component_id, last_msg);
-	mavlink_test_vicon_position_estimate(system_id, component_id, last_msg);
-	mavlink_test_vision_speed_estimate(system_id, component_id, last_msg);
-	mavlink_test_position_control_setpoint_set(system_id, component_id, last_msg);
-	mavlink_test_position_control_offset_set(system_id, component_id, last_msg);
-	mavlink_test_position_control_setpoint(system_id, component_id, last_msg);
-	mavlink_test_marker(system_id, component_id, last_msg);
-	mavlink_test_raw_aux(system_id, component_id, last_msg);
-	mavlink_test_watchdog_heartbeat(system_id, component_id, last_msg);
-	mavlink_test_watchdog_process_info(system_id, component_id, last_msg);
-	mavlink_test_watchdog_process_status(system_id, component_id, last_msg);
-	mavlink_test_watchdog_command(system_id, component_id, last_msg);
-	mavlink_test_pattern_detected(system_id, component_id, last_msg);
-	mavlink_test_point_of_interest(system_id, component_id, last_msg);
-	mavlink_test_point_of_interest_connection(system_id, component_id, last_msg);
-	mavlink_test_data_transmission_handshake(system_id, component_id, last_msg);
-	mavlink_test_encapsulated_data(system_id, component_id, last_msg);
-	mavlink_test_brief_feature(system_id, component_id, last_msg);
-	mavlink_test_attitude_control(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // PIXHAWK_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/pixhawk/version.h b/mavlink/include/mavlink/v0.9/pixhawk/version.h
deleted file mode 100644
index e13db0762..000000000
--- a/mavlink/include/mavlink/v0.9/pixhawk/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from pixhawk.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:50 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/protocol.h b/mavlink/include/mavlink/v0.9/protocol.h
deleted file mode 100644
index 05195c369..000000000
--- a/mavlink/include/mavlink/v0.9/protocol.h
+++ /dev/null
@@ -1,319 +0,0 @@
-#ifndef  _MAVLINK_PROTOCOL_H_
-#define  _MAVLINK_PROTOCOL_H_
-
-#include "string.h"
-#include "mavlink_types.h"
-
-/* 
-   If you want MAVLink on a system that is native big-endian,
-   you need to define NATIVE_BIG_ENDIAN
-*/
-#ifdef NATIVE_BIG_ENDIAN
-# define MAVLINK_NEED_BYTE_SWAP (MAVLINK_ENDIAN == MAVLINK_LITTLE_ENDIAN)
-#else
-# define MAVLINK_NEED_BYTE_SWAP (MAVLINK_ENDIAN != MAVLINK_LITTLE_ENDIAN)
-#endif
-
-#ifndef MAVLINK_STACK_BUFFER
-#define MAVLINK_STACK_BUFFER 0
-#endif
-
-#ifndef MAVLINK_AVOID_GCC_STACK_BUG
-# define MAVLINK_AVOID_GCC_STACK_BUG defined(__GNUC__)
-#endif
-
-#ifndef MAVLINK_ASSERT
-#define MAVLINK_ASSERT(x)
-#endif
-
-#ifndef MAVLINK_START_UART_SEND
-#define MAVLINK_START_UART_SEND(chan, length)
-#endif
-
-#ifndef MAVLINK_END_UART_SEND
-#define MAVLINK_END_UART_SEND(chan, length)
-#endif
-
-#ifdef MAVLINK_SEPARATE_HELPERS
-#define MAVLINK_HELPER
-#else
-#define MAVLINK_HELPER static inline
-#include "mavlink_helpers.h"
-#endif // MAVLINK_SEPARATE_HELPERS
-
-/* always include the prototypes to ensure we don't get out of sync */
-MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan);
-#if MAVLINK_CRC_EXTRA
-MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						      uint8_t chan, uint8_t length, uint8_t crc_extra);
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length, uint8_t crc_extra);
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, 
-						    uint8_t length, uint8_t crc_extra);
-#endif
-#else
-MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						      uint8_t chan, uint8_t length);
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length);
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, uint8_t length);
-#endif // MAVLINK_CRC_EXTRA
-MAVLINK_HELPER uint16_t mavlink_msg_to_send_buffer(uint8_t *buffer, const mavlink_message_t *msg);
-MAVLINK_HELPER void mavlink_start_checksum(mavlink_message_t* msg);
-MAVLINK_HELPER void mavlink_update_checksum(mavlink_message_t* msg, uint8_t c);
-MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_message_t* r_message, mavlink_status_t* r_mavlink_status);
-MAVLINK_HELPER uint8_t put_bitfield_n_by_index(int32_t b, uint8_t bits, uint8_t packet_index, uint8_t bit_index, 
-					       uint8_t* r_bit_index, uint8_t* buffer);
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len);
-#endif
-
-/**
- * @brief Get the required buffer size for this message
- */
-static inline uint16_t mavlink_msg_get_send_buffer_length(const mavlink_message_t* msg)
-{
-	return msg->len + MAVLINK_NUM_NON_PAYLOAD_BYTES;
-}
-
-#if MAVLINK_NEED_BYTE_SWAP
-static inline void byte_swap_2(char *dst, const char *src)
-{
-	dst[0] = src[1];
-	dst[1] = src[0];
-}
-static inline void byte_swap_4(char *dst, const char *src)
-{
-	dst[0] = src[3];
-	dst[1] = src[2];
-	dst[2] = src[1];
-	dst[3] = src[0];
-}
-static inline void byte_swap_8(char *dst, const char *src)
-{
-	dst[0] = src[7];
-	dst[1] = src[6];
-	dst[2] = src[5];
-	dst[3] = src[4];
-	dst[4] = src[3];
-	dst[5] = src[2];
-	dst[6] = src[1];
-	dst[7] = src[0];
-}
-#elif !MAVLINK_ALIGNED_FIELDS
-static inline void byte_copy_2(char *dst, const char *src)
-{
-	dst[0] = src[0];
-	dst[1] = src[1];
-}
-static inline void byte_copy_4(char *dst, const char *src)
-{
-	dst[0] = src[0];
-	dst[1] = src[1];
-	dst[2] = src[2];
-	dst[3] = src[3];
-}
-static inline void byte_copy_8(char *dst, const char *src)
-{
-	memcpy(dst, src, 8);
-}
-#endif
-
-#define _mav_put_uint8_t(buf, wire_offset, b) buf[wire_offset] = (uint8_t)b
-#define _mav_put_int8_t(buf, wire_offset, b)  buf[wire_offset] = (int8_t)b
-#define _mav_put_char(buf, wire_offset, b)    buf[wire_offset] = b
-
-#if MAVLINK_NEED_BYTE_SWAP
-#define _mav_put_uint16_t(buf, wire_offset, b) byte_swap_2(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int16_t(buf, wire_offset, b)  byte_swap_2(&buf[wire_offset], (const char *)&b)
-#define _mav_put_uint32_t(buf, wire_offset, b) byte_swap_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int32_t(buf, wire_offset, b)  byte_swap_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_uint64_t(buf, wire_offset, b) byte_swap_8(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int64_t(buf, wire_offset, b)  byte_swap_8(&buf[wire_offset], (const char *)&b)
-#define _mav_put_float(buf, wire_offset, b)    byte_swap_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_double(buf, wire_offset, b)   byte_swap_8(&buf[wire_offset], (const char *)&b)
-#elif !MAVLINK_ALIGNED_FIELDS
-#define _mav_put_uint16_t(buf, wire_offset, b) byte_copy_2(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int16_t(buf, wire_offset, b)  byte_copy_2(&buf[wire_offset], (const char *)&b)
-#define _mav_put_uint32_t(buf, wire_offset, b) byte_copy_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int32_t(buf, wire_offset, b)  byte_copy_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_uint64_t(buf, wire_offset, b) byte_copy_8(&buf[wire_offset], (const char *)&b)
-#define _mav_put_int64_t(buf, wire_offset, b)  byte_copy_8(&buf[wire_offset], (const char *)&b)
-#define _mav_put_float(buf, wire_offset, b)    byte_copy_4(&buf[wire_offset], (const char *)&b)
-#define _mav_put_double(buf, wire_offset, b)   byte_copy_8(&buf[wire_offset], (const char *)&b)
-#else
-#define _mav_put_uint16_t(buf, wire_offset, b) *(uint16_t *)&buf[wire_offset] = b
-#define _mav_put_int16_t(buf, wire_offset, b)  *(int16_t *)&buf[wire_offset] = b
-#define _mav_put_uint32_t(buf, wire_offset, b) *(uint32_t *)&buf[wire_offset] = b
-#define _mav_put_int32_t(buf, wire_offset, b)  *(int32_t *)&buf[wire_offset] = b
-#define _mav_put_uint64_t(buf, wire_offset, b) *(uint64_t *)&buf[wire_offset] = b
-#define _mav_put_int64_t(buf, wire_offset, b)  *(int64_t *)&buf[wire_offset] = b
-#define _mav_put_float(buf, wire_offset, b)    *(float *)&buf[wire_offset] = b
-#define _mav_put_double(buf, wire_offset, b)   *(double *)&buf[wire_offset] = b
-#endif
-
-/*
-  like memcpy(), but if src is NULL, do a memset to zero
- */
-static void mav_array_memcpy(void *dest, const void *src, size_t n)
-{
-	if (src == NULL) {
-		memset(dest, 0, n);
-	} else {
-		memcpy(dest, src, n);
-	}
-}
-
-/*
- * Place a char array into a buffer
- */
-static inline void _mav_put_char_array(char *buf, uint8_t wire_offset, const char *b, uint8_t array_length)
-{
-	mav_array_memcpy(&buf[wire_offset], b, array_length);
-}
-
-/*
- * Place a uint8_t array into a buffer
- */
-static inline void _mav_put_uint8_t_array(char *buf, uint8_t wire_offset, const uint8_t *b, uint8_t array_length)
-{
-	mav_array_memcpy(&buf[wire_offset], b, array_length);
-}
-
-/*
- * Place a int8_t array into a buffer
- */
-static inline void _mav_put_int8_t_array(char *buf, uint8_t wire_offset, const int8_t *b, uint8_t array_length)
-{
-	mav_array_memcpy(&buf[wire_offset], b, array_length);
-}
-
-#if MAVLINK_NEED_BYTE_SWAP
-#define _MAV_PUT_ARRAY(TYPE, V) \
-static inline void _mav_put_ ## TYPE ##_array(char *buf, uint8_t wire_offset, const TYPE *b, uint8_t array_length) \
-{ \
-	if (b == NULL) { \
-		memset(&buf[wire_offset], 0, array_length*sizeof(TYPE)); \
-	} else { \
-		uint16_t i; \
-		for (i=0; i<array_length; i++) { \
-			_mav_put_## TYPE (buf, wire_offset+(i*sizeof(TYPE)), b[i]); \
-		} \
-	} \
-}
-#else
-#define _MAV_PUT_ARRAY(TYPE, V)					\
-static inline void _mav_put_ ## TYPE ##_array(char *buf, uint8_t wire_offset, const TYPE *b, uint8_t array_length) \
-{ \
-	mav_array_memcpy(&buf[wire_offset], b, array_length*sizeof(TYPE));	\
-}
-#endif
-
-_MAV_PUT_ARRAY(uint16_t, u16)
-_MAV_PUT_ARRAY(uint32_t, u32)
-_MAV_PUT_ARRAY(uint64_t, u64)
-_MAV_PUT_ARRAY(int16_t,  i16)
-_MAV_PUT_ARRAY(int32_t,  i32)
-_MAV_PUT_ARRAY(int64_t,  i64)
-_MAV_PUT_ARRAY(float,    f)
-_MAV_PUT_ARRAY(double,   d)
-
-#define _MAV_RETURN_char(msg, wire_offset)             _MAV_PAYLOAD(msg)[wire_offset]
-#define _MAV_RETURN_int8_t(msg, wire_offset)   (int8_t)_MAV_PAYLOAD(msg)[wire_offset]
-#define _MAV_RETURN_uint8_t(msg, wire_offset) (uint8_t)_MAV_PAYLOAD(msg)[wire_offset]
-
-#if MAVLINK_NEED_BYTE_SWAP
-#define _MAV_MSG_RETURN_TYPE(TYPE, SIZE) \
-static inline TYPE _MAV_RETURN_## TYPE(const mavlink_message_t *msg, uint8_t ofs) \
-{ TYPE r; byte_swap_## SIZE((char*)&r, &_MAV_PAYLOAD(msg)[ofs]); return r; }
-
-_MAV_MSG_RETURN_TYPE(uint16_t, 2)
-_MAV_MSG_RETURN_TYPE(int16_t,  2)
-_MAV_MSG_RETURN_TYPE(uint32_t, 4)
-_MAV_MSG_RETURN_TYPE(int32_t,  4)
-_MAV_MSG_RETURN_TYPE(uint64_t, 8)
-_MAV_MSG_RETURN_TYPE(int64_t,  8)
-_MAV_MSG_RETURN_TYPE(float,    4)
-_MAV_MSG_RETURN_TYPE(double,   8)
-
-#elif !MAVLINK_ALIGNED_FIELDS
-#define _MAV_MSG_RETURN_TYPE(TYPE, SIZE) \
-static inline TYPE _MAV_RETURN_## TYPE(const mavlink_message_t *msg, uint8_t ofs) \
-{ TYPE r; byte_copy_## SIZE((char*)&r, &_MAV_PAYLOAD(msg)[ofs]); return r; }
-
-_MAV_MSG_RETURN_TYPE(uint16_t, 2)
-_MAV_MSG_RETURN_TYPE(int16_t,  2)
-_MAV_MSG_RETURN_TYPE(uint32_t, 4)
-_MAV_MSG_RETURN_TYPE(int32_t,  4)
-_MAV_MSG_RETURN_TYPE(uint64_t, 8)
-_MAV_MSG_RETURN_TYPE(int64_t,  8)
-_MAV_MSG_RETURN_TYPE(float,    4)
-_MAV_MSG_RETURN_TYPE(double,   8)
-#else // nicely aligned, no swap
-#define _MAV_MSG_RETURN_TYPE(TYPE) \
-static inline TYPE _MAV_RETURN_## TYPE(const mavlink_message_t *msg, uint8_t ofs) \
-{ return *(const TYPE *)(&_MAV_PAYLOAD(msg)[ofs]);}
-
-_MAV_MSG_RETURN_TYPE(uint16_t)
-_MAV_MSG_RETURN_TYPE(int16_t)
-_MAV_MSG_RETURN_TYPE(uint32_t)
-_MAV_MSG_RETURN_TYPE(int32_t)
-_MAV_MSG_RETURN_TYPE(uint64_t)
-_MAV_MSG_RETURN_TYPE(int64_t)
-_MAV_MSG_RETURN_TYPE(float)
-_MAV_MSG_RETURN_TYPE(double)
-#endif // MAVLINK_NEED_BYTE_SWAP
-
-static inline uint16_t _MAV_RETURN_char_array(const mavlink_message_t *msg, char *value, 
-						     uint8_t array_length, uint8_t wire_offset)
-{
-	memcpy(value, &_MAV_PAYLOAD(msg)[wire_offset], array_length);
-	return array_length;
-}
-
-static inline uint16_t _MAV_RETURN_uint8_t_array(const mavlink_message_t *msg, uint8_t *value, 
-							uint8_t array_length, uint8_t wire_offset)
-{
-	memcpy(value, &_MAV_PAYLOAD(msg)[wire_offset], array_length);
-	return array_length;
-}
-
-static inline uint16_t _MAV_RETURN_int8_t_array(const mavlink_message_t *msg, int8_t *value, 
-						       uint8_t array_length, uint8_t wire_offset)
-{
-	memcpy(value, &_MAV_PAYLOAD(msg)[wire_offset], array_length);
-	return array_length;
-}
-
-#if MAVLINK_NEED_BYTE_SWAP
-#define _MAV_RETURN_ARRAY(TYPE, V) \
-static inline uint16_t _MAV_RETURN_## TYPE ##_array(const mavlink_message_t *msg, TYPE *value, \
-							 uint8_t array_length, uint8_t wire_offset) \
-{ \
-	uint16_t i; \
-	for (i=0; i<array_length; i++) { \
-		value[i] = _MAV_RETURN_## TYPE (msg, wire_offset+(i*sizeof(value[0]))); \
-	} \
-	return array_length*sizeof(value[0]); \
-}
-#else
-#define _MAV_RETURN_ARRAY(TYPE, V)					\
-static inline uint16_t _MAV_RETURN_## TYPE ##_array(const mavlink_message_t *msg, TYPE *value, \
-							 uint8_t array_length, uint8_t wire_offset) \
-{ \
-	memcpy(value, &_MAV_PAYLOAD(msg)[wire_offset], array_length*sizeof(TYPE)); \
-	return array_length*sizeof(TYPE); \
-}
-#endif
-
-_MAV_RETURN_ARRAY(uint16_t, u16)
-_MAV_RETURN_ARRAY(uint32_t, u32)
-_MAV_RETURN_ARRAY(uint64_t, u64)
-_MAV_RETURN_ARRAY(int16_t,  i16)
-_MAV_RETURN_ARRAY(int32_t,  i32)
-_MAV_RETURN_ARRAY(int64_t,  i64)
-_MAV_RETURN_ARRAY(float,    f)
-_MAV_RETURN_ARRAY(double,   d)
-
-#endif // _MAVLINK_PROTOCOL_H_
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink.h b/mavlink/include/mavlink/v0.9/slugs/mavlink.h
deleted file mode 100644
index 0178676d2..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from slugs.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "slugs.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_air_data.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_air_data.h
deleted file mode 100644
index a9e3cad36..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_air_data.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE AIR_DATA PACKING
-
-#define MAVLINK_MSG_ID_AIR_DATA 171
-
-typedef struct __mavlink_air_data_t
-{
- float dynamicPressure; ///< Dynamic pressure (Pa)
- float staticPressure; ///< Static pressure (Pa)
- uint16_t temperature; ///< Board temperature
-} mavlink_air_data_t;
-
-#define MAVLINK_MSG_ID_AIR_DATA_LEN 10
-#define MAVLINK_MSG_ID_171_LEN 10
-
-
-
-#define MAVLINK_MESSAGE_INFO_AIR_DATA { \
-	"AIR_DATA", \
-	3, \
-	{  { "dynamicPressure", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_air_data_t, dynamicPressure) }, \
-         { "staticPressure", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_air_data_t, staticPressure) }, \
-         { "temperature", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_air_data_t, temperature) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a air_data message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_air_data_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float dynamicPressure, float staticPressure, uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 10);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AIR_DATA;
-	return mavlink_finalize_message(msg, system_id, component_id, 10);
-}
-
-/**
- * @brief Pack a air_data message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_air_data_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float dynamicPressure,float staticPressure,uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 10);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AIR_DATA;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 10);
-}
-
-/**
- * @brief Encode a air_data struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param air_data C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_air_data_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_air_data_t* air_data)
-{
-	return mavlink_msg_air_data_pack(system_id, component_id, msg, air_data->dynamicPressure, air_data->staticPressure, air_data->temperature);
-}
-
-/**
- * @brief Send a air_data message
- * @param chan MAVLink channel to send the message
- *
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_air_data_send(mavlink_channel_t chan, float dynamicPressure, float staticPressure, uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AIR_DATA, buf, 10);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AIR_DATA, (const char *)&packet, 10);
-#endif
-}
-
-#endif
-
-// MESSAGE AIR_DATA UNPACKING
-
-
-/**
- * @brief Get field dynamicPressure from air_data message
- *
- * @return Dynamic pressure (Pa)
- */
-static inline float mavlink_msg_air_data_get_dynamicPressure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field staticPressure from air_data message
- *
- * @return Static pressure (Pa)
- */
-static inline float mavlink_msg_air_data_get_staticPressure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field temperature from air_data message
- *
- * @return Board temperature
- */
-static inline uint16_t mavlink_msg_air_data_get_temperature(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Decode a air_data message into a struct
- *
- * @param msg The message to decode
- * @param air_data C-struct to decode the message contents into
- */
-static inline void mavlink_msg_air_data_decode(const mavlink_message_t* msg, mavlink_air_data_t* air_data)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	air_data->dynamicPressure = mavlink_msg_air_data_get_dynamicPressure(msg);
-	air_data->staticPressure = mavlink_msg_air_data_get_staticPressure(msg);
-	air_data->temperature = mavlink_msg_air_data_get_temperature(msg);
-#else
-	memcpy(air_data, _MAV_PAYLOAD(msg), 10);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_cpu_load.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_cpu_load.h
deleted file mode 100644
index a3bc972f1..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_cpu_load.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE CPU_LOAD PACKING
-
-#define MAVLINK_MSG_ID_CPU_LOAD 170
-
-typedef struct __mavlink_cpu_load_t
-{
- uint8_t sensLoad; ///< Sensor DSC Load
- uint8_t ctrlLoad; ///< Control DSC Load
- uint16_t batVolt; ///< Battery Voltage in millivolts
-} mavlink_cpu_load_t;
-
-#define MAVLINK_MSG_ID_CPU_LOAD_LEN 4
-#define MAVLINK_MSG_ID_170_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_CPU_LOAD { \
-	"CPU_LOAD", \
-	3, \
-	{  { "sensLoad", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_cpu_load_t, sensLoad) }, \
-         { "ctrlLoad", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_cpu_load_t, ctrlLoad) }, \
-         { "batVolt", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_cpu_load_t, batVolt) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a cpu_load message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_cpu_load_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t sensLoad, uint8_t ctrlLoad, uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, sensLoad);
-	_mav_put_uint8_t(buf, 1, ctrlLoad);
-	_mav_put_uint16_t(buf, 2, batVolt);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_cpu_load_t packet;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-	packet.batVolt = batVolt;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CPU_LOAD;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a cpu_load message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_cpu_load_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t sensLoad,uint8_t ctrlLoad,uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, sensLoad);
-	_mav_put_uint8_t(buf, 1, ctrlLoad);
-	_mav_put_uint16_t(buf, 2, batVolt);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_cpu_load_t packet;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-	packet.batVolt = batVolt;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CPU_LOAD;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a cpu_load struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param cpu_load C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_cpu_load_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_cpu_load_t* cpu_load)
-{
-	return mavlink_msg_cpu_load_pack(system_id, component_id, msg, cpu_load->sensLoad, cpu_load->ctrlLoad, cpu_load->batVolt);
-}
-
-/**
- * @brief Send a cpu_load message
- * @param chan MAVLink channel to send the message
- *
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_cpu_load_send(mavlink_channel_t chan, uint8_t sensLoad, uint8_t ctrlLoad, uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, sensLoad);
-	_mav_put_uint8_t(buf, 1, ctrlLoad);
-	_mav_put_uint16_t(buf, 2, batVolt);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CPU_LOAD, buf, 4);
-#else
-	mavlink_cpu_load_t packet;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-	packet.batVolt = batVolt;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CPU_LOAD, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE CPU_LOAD UNPACKING
-
-
-/**
- * @brief Get field sensLoad from cpu_load message
- *
- * @return Sensor DSC Load
- */
-static inline uint8_t mavlink_msg_cpu_load_get_sensLoad(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field ctrlLoad from cpu_load message
- *
- * @return Control DSC Load
- */
-static inline uint8_t mavlink_msg_cpu_load_get_ctrlLoad(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field batVolt from cpu_load message
- *
- * @return Battery Voltage in millivolts
- */
-static inline uint16_t mavlink_msg_cpu_load_get_batVolt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a cpu_load message into a struct
- *
- * @param msg The message to decode
- * @param cpu_load C-struct to decode the message contents into
- */
-static inline void mavlink_msg_cpu_load_decode(const mavlink_message_t* msg, mavlink_cpu_load_t* cpu_load)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	cpu_load->sensLoad = mavlink_msg_cpu_load_get_sensLoad(msg);
-	cpu_load->ctrlLoad = mavlink_msg_cpu_load_get_ctrlLoad(msg);
-	cpu_load->batVolt = mavlink_msg_cpu_load_get_batVolt(msg);
-#else
-	memcpy(cpu_load, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_ctrl_srfc_pt.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_ctrl_srfc_pt.h
deleted file mode 100644
index d6f94e1da..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_ctrl_srfc_pt.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE CTRL_SRFC_PT PACKING
-
-#define MAVLINK_MSG_ID_CTRL_SRFC_PT 181
-
-typedef struct __mavlink_ctrl_srfc_pt_t
-{
- uint8_t target; ///< The system setting the commands
- uint16_t bitfieldPt; ///< Bitfield containing the PT configuration
-} mavlink_ctrl_srfc_pt_t;
-
-#define MAVLINK_MSG_ID_CTRL_SRFC_PT_LEN 3
-#define MAVLINK_MSG_ID_181_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_CTRL_SRFC_PT { \
-	"CTRL_SRFC_PT", \
-	2, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_ctrl_srfc_pt_t, target) }, \
-         { "bitfieldPt", NULL, MAVLINK_TYPE_UINT16_T, 0, 1, offsetof(mavlink_ctrl_srfc_pt_t, bitfieldPt) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ctrl_srfc_pt message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint16_t(buf, 1, bitfieldPt);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.target = target;
-	packet.bitfieldPt = bitfieldPt;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CTRL_SRFC_PT;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a ctrl_srfc_pt message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint16_t(buf, 1, bitfieldPt);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.target = target;
-	packet.bitfieldPt = bitfieldPt;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CTRL_SRFC_PT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a ctrl_srfc_pt struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ctrl_srfc_pt C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ctrl_srfc_pt_t* ctrl_srfc_pt)
-{
-	return mavlink_msg_ctrl_srfc_pt_pack(system_id, component_id, msg, ctrl_srfc_pt->target, ctrl_srfc_pt->bitfieldPt);
-}
-
-/**
- * @brief Send a ctrl_srfc_pt message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ctrl_srfc_pt_send(mavlink_channel_t chan, uint8_t target, uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint16_t(buf, 1, bitfieldPt);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CTRL_SRFC_PT, buf, 3);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.target = target;
-	packet.bitfieldPt = bitfieldPt;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CTRL_SRFC_PT, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE CTRL_SRFC_PT UNPACKING
-
-
-/**
- * @brief Get field target from ctrl_srfc_pt message
- *
- * @return The system setting the commands
- */
-static inline uint8_t mavlink_msg_ctrl_srfc_pt_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field bitfieldPt from ctrl_srfc_pt message
- *
- * @return Bitfield containing the PT configuration
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_get_bitfieldPt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  1);
-}
-
-/**
- * @brief Decode a ctrl_srfc_pt message into a struct
- *
- * @param msg The message to decode
- * @param ctrl_srfc_pt C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ctrl_srfc_pt_decode(const mavlink_message_t* msg, mavlink_ctrl_srfc_pt_t* ctrl_srfc_pt)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ctrl_srfc_pt->target = mavlink_msg_ctrl_srfc_pt_get_target(msg);
-	ctrl_srfc_pt->bitfieldPt = mavlink_msg_ctrl_srfc_pt_get_bitfieldPt(msg);
-#else
-	memcpy(ctrl_srfc_pt, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_data_log.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_data_log.h
deleted file mode 100644
index 19a03e5c6..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_data_log.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE DATA_LOG PACKING
-
-#define MAVLINK_MSG_ID_DATA_LOG 177
-
-typedef struct __mavlink_data_log_t
-{
- float fl_1; ///< Log value 1 
- float fl_2; ///< Log value 2 
- float fl_3; ///< Log value 3 
- float fl_4; ///< Log value 4 
- float fl_5; ///< Log value 5 
- float fl_6; ///< Log value 6 
-} mavlink_data_log_t;
-
-#define MAVLINK_MSG_ID_DATA_LOG_LEN 24
-#define MAVLINK_MSG_ID_177_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_DATA_LOG { \
-	"DATA_LOG", \
-	6, \
-	{  { "fl_1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_data_log_t, fl_1) }, \
-         { "fl_2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_data_log_t, fl_2) }, \
-         { "fl_3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_data_log_t, fl_3) }, \
-         { "fl_4", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_data_log_t, fl_4) }, \
-         { "fl_5", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_data_log_t, fl_5) }, \
-         { "fl_6", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_data_log_t, fl_6) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a data_log message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_log_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float fl_1, float fl_2, float fl_3, float fl_4, float fl_5, float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_LOG;
-	return mavlink_finalize_message(msg, system_id, component_id, 24);
-}
-
-/**
- * @brief Pack a data_log message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_log_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float fl_1,float fl_2,float fl_3,float fl_4,float fl_5,float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_LOG;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24);
-}
-
-/**
- * @brief Encode a data_log struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param data_log C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_data_log_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_data_log_t* data_log)
-{
-	return mavlink_msg_data_log_pack(system_id, component_id, msg, data_log->fl_1, data_log->fl_2, data_log->fl_3, data_log->fl_4, data_log->fl_5, data_log->fl_6);
-}
-
-/**
- * @brief Send a data_log message
- * @param chan MAVLink channel to send the message
- *
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_data_log_send(mavlink_channel_t chan, float fl_1, float fl_2, float fl_3, float fl_4, float fl_5, float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_LOG, buf, 24);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_LOG, (const char *)&packet, 24);
-#endif
-}
-
-#endif
-
-// MESSAGE DATA_LOG UNPACKING
-
-
-/**
- * @brief Get field fl_1 from data_log message
- *
- * @return Log value 1 
- */
-static inline float mavlink_msg_data_log_get_fl_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field fl_2 from data_log message
- *
- * @return Log value 2 
- */
-static inline float mavlink_msg_data_log_get_fl_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field fl_3 from data_log message
- *
- * @return Log value 3 
- */
-static inline float mavlink_msg_data_log_get_fl_3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field fl_4 from data_log message
- *
- * @return Log value 4 
- */
-static inline float mavlink_msg_data_log_get_fl_4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field fl_5 from data_log message
- *
- * @return Log value 5 
- */
-static inline float mavlink_msg_data_log_get_fl_5(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field fl_6 from data_log message
- *
- * @return Log value 6 
- */
-static inline float mavlink_msg_data_log_get_fl_6(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a data_log message into a struct
- *
- * @param msg The message to decode
- * @param data_log C-struct to decode the message contents into
- */
-static inline void mavlink_msg_data_log_decode(const mavlink_message_t* msg, mavlink_data_log_t* data_log)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	data_log->fl_1 = mavlink_msg_data_log_get_fl_1(msg);
-	data_log->fl_2 = mavlink_msg_data_log_get_fl_2(msg);
-	data_log->fl_3 = mavlink_msg_data_log_get_fl_3(msg);
-	data_log->fl_4 = mavlink_msg_data_log_get_fl_4(msg);
-	data_log->fl_5 = mavlink_msg_data_log_get_fl_5(msg);
-	data_log->fl_6 = mavlink_msg_data_log_get_fl_6(msg);
-#else
-	memcpy(data_log, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_diagnostic.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_diagnostic.h
deleted file mode 100644
index 5cdf890ae..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_diagnostic.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE DIAGNOSTIC PACKING
-
-#define MAVLINK_MSG_ID_DIAGNOSTIC 173
-
-typedef struct __mavlink_diagnostic_t
-{
- float diagFl1; ///< Diagnostic float 1
- float diagFl2; ///< Diagnostic float 2
- float diagFl3; ///< Diagnostic float 3
- int16_t diagSh1; ///< Diagnostic short 1
- int16_t diagSh2; ///< Diagnostic short 2
- int16_t diagSh3; ///< Diagnostic short 3
-} mavlink_diagnostic_t;
-
-#define MAVLINK_MSG_ID_DIAGNOSTIC_LEN 18
-#define MAVLINK_MSG_ID_173_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_DIAGNOSTIC { \
-	"DIAGNOSTIC", \
-	6, \
-	{  { "diagFl1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_diagnostic_t, diagFl1) }, \
-         { "diagFl2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_diagnostic_t, diagFl2) }, \
-         { "diagFl3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_diagnostic_t, diagFl3) }, \
-         { "diagSh1", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_diagnostic_t, diagSh1) }, \
-         { "diagSh2", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_diagnostic_t, diagSh2) }, \
-         { "diagSh3", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_diagnostic_t, diagSh3) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a diagnostic message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_diagnostic_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float diagFl1, float diagFl2, float diagFl3, int16_t diagSh1, int16_t diagSh2, int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIAGNOSTIC;
-	return mavlink_finalize_message(msg, system_id, component_id, 18);
-}
-
-/**
- * @brief Pack a diagnostic message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_diagnostic_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float diagFl1,float diagFl2,float diagFl3,int16_t diagSh1,int16_t diagSh2,int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIAGNOSTIC;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
-}
-
-/**
- * @brief Encode a diagnostic struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param diagnostic C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_diagnostic_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_diagnostic_t* diagnostic)
-{
-	return mavlink_msg_diagnostic_pack(system_id, component_id, msg, diagnostic->diagFl1, diagnostic->diagFl2, diagnostic->diagFl3, diagnostic->diagSh1, diagnostic->diagSh2, diagnostic->diagSh3);
-}
-
-/**
- * @brief Send a diagnostic message
- * @param chan MAVLink channel to send the message
- *
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_diagnostic_send(mavlink_channel_t chan, float diagFl1, float diagFl2, float diagFl3, int16_t diagSh1, int16_t diagSh2, int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIAGNOSTIC, buf, 18);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIAGNOSTIC, (const char *)&packet, 18);
-#endif
-}
-
-#endif
-
-// MESSAGE DIAGNOSTIC UNPACKING
-
-
-/**
- * @brief Get field diagFl1 from diagnostic message
- *
- * @return Diagnostic float 1
- */
-static inline float mavlink_msg_diagnostic_get_diagFl1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field diagFl2 from diagnostic message
- *
- * @return Diagnostic float 2
- */
-static inline float mavlink_msg_diagnostic_get_diagFl2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field diagFl3 from diagnostic message
- *
- * @return Diagnostic float 3
- */
-static inline float mavlink_msg_diagnostic_get_diagFl3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field diagSh1 from diagnostic message
- *
- * @return Diagnostic short 1
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field diagSh2 from diagnostic message
- *
- * @return Diagnostic short 2
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field diagSh3 from diagnostic message
- *
- * @return Diagnostic short 3
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Decode a diagnostic message into a struct
- *
- * @param msg The message to decode
- * @param diagnostic C-struct to decode the message contents into
- */
-static inline void mavlink_msg_diagnostic_decode(const mavlink_message_t* msg, mavlink_diagnostic_t* diagnostic)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	diagnostic->diagFl1 = mavlink_msg_diagnostic_get_diagFl1(msg);
-	diagnostic->diagFl2 = mavlink_msg_diagnostic_get_diagFl2(msg);
-	diagnostic->diagFl3 = mavlink_msg_diagnostic_get_diagFl3(msg);
-	diagnostic->diagSh1 = mavlink_msg_diagnostic_get_diagSh1(msg);
-	diagnostic->diagSh2 = mavlink_msg_diagnostic_get_diagSh2(msg);
-	diagnostic->diagSh3 = mavlink_msg_diagnostic_get_diagSh3(msg);
-#else
-	memcpy(diagnostic, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_gps_date_time.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_gps_date_time.h
deleted file mode 100644
index 6104fd7a7..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_gps_date_time.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE GPS_DATE_TIME PACKING
-
-#define MAVLINK_MSG_ID_GPS_DATE_TIME 179
-
-typedef struct __mavlink_gps_date_time_t
-{
- uint8_t year; ///< Year reported by Gps 
- uint8_t month; ///< Month reported by Gps 
- uint8_t day; ///< Day reported by Gps 
- uint8_t hour; ///< Hour reported by Gps 
- uint8_t min; ///< Min reported by Gps 
- uint8_t sec; ///< Sec reported by Gps  
- uint8_t visSat; ///< Visible sattelites reported by Gps  
-} mavlink_gps_date_time_t;
-
-#define MAVLINK_MSG_ID_GPS_DATE_TIME_LEN 7
-#define MAVLINK_MSG_ID_179_LEN 7
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_DATE_TIME { \
-	"GPS_DATE_TIME", \
-	7, \
-	{  { "year", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_gps_date_time_t, year) }, \
-         { "month", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_gps_date_time_t, month) }, \
-         { "day", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_gps_date_time_t, day) }, \
-         { "hour", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_gps_date_time_t, hour) }, \
-         { "min", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_gps_date_time_t, min) }, \
-         { "sec", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_gps_date_time_t, sec) }, \
-         { "visSat", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_gps_date_time_t, visSat) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_date_time message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_date_time_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t min, uint8_t sec, uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 7);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 7);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_DATE_TIME;
-	return mavlink_finalize_message(msg, system_id, component_id, 7);
-}
-
-/**
- * @brief Pack a gps_date_time message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_date_time_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t year,uint8_t month,uint8_t day,uint8_t hour,uint8_t min,uint8_t sec,uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 7);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 7);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_DATE_TIME;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 7);
-}
-
-/**
- * @brief Encode a gps_date_time struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_date_time C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_date_time_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_date_time_t* gps_date_time)
-{
-	return mavlink_msg_gps_date_time_pack(system_id, component_id, msg, gps_date_time->year, gps_date_time->month, gps_date_time->day, gps_date_time->hour, gps_date_time->min, gps_date_time->sec, gps_date_time->visSat);
-}
-
-/**
- * @brief Send a gps_date_time message
- * @param chan MAVLink channel to send the message
- *
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_date_time_send(mavlink_channel_t chan, uint8_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t min, uint8_t sec, uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_DATE_TIME, buf, 7);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_DATE_TIME, (const char *)&packet, 7);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_DATE_TIME UNPACKING
-
-
-/**
- * @brief Get field year from gps_date_time message
- *
- * @return Year reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_year(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field month from gps_date_time message
- *
- * @return Month reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_month(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field day from gps_date_time message
- *
- * @return Day reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_day(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field hour from gps_date_time message
- *
- * @return Hour reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_hour(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field min from gps_date_time message
- *
- * @return Min reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_min(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field sec from gps_date_time message
- *
- * @return Sec reported by Gps  
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_sec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field visSat from gps_date_time message
- *
- * @return Visible sattelites reported by Gps  
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_visSat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Decode a gps_date_time message into a struct
- *
- * @param msg The message to decode
- * @param gps_date_time C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_date_time_decode(const mavlink_message_t* msg, mavlink_gps_date_time_t* gps_date_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_date_time->year = mavlink_msg_gps_date_time_get_year(msg);
-	gps_date_time->month = mavlink_msg_gps_date_time_get_month(msg);
-	gps_date_time->day = mavlink_msg_gps_date_time_get_day(msg);
-	gps_date_time->hour = mavlink_msg_gps_date_time_get_hour(msg);
-	gps_date_time->min = mavlink_msg_gps_date_time_get_min(msg);
-	gps_date_time->sec = mavlink_msg_gps_date_time_get_sec(msg);
-	gps_date_time->visSat = mavlink_msg_gps_date_time_get_visSat(msg);
-#else
-	memcpy(gps_date_time, _MAV_PAYLOAD(msg), 7);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_mid_lvl_cmds.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_mid_lvl_cmds.h
deleted file mode 100644
index 4ae723b44..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_mid_lvl_cmds.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE MID_LVL_CMDS PACKING
-
-#define MAVLINK_MSG_ID_MID_LVL_CMDS 180
-
-typedef struct __mavlink_mid_lvl_cmds_t
-{
- uint8_t target; ///< The system setting the commands
- float hCommand; ///< Commanded Airspeed
- float uCommand; ///< Log value 2 
- float rCommand; ///< Log value 3 
-} mavlink_mid_lvl_cmds_t;
-
-#define MAVLINK_MSG_ID_MID_LVL_CMDS_LEN 13
-#define MAVLINK_MSG_ID_180_LEN 13
-
-
-
-#define MAVLINK_MESSAGE_INFO_MID_LVL_CMDS { \
-	"MID_LVL_CMDS", \
-	4, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_mid_lvl_cmds_t, target) }, \
-         { "hCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_mid_lvl_cmds_t, hCommand) }, \
-         { "uCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_mid_lvl_cmds_t, uCommand) }, \
-         { "rCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_mid_lvl_cmds_t, rCommand) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a mid_lvl_cmds message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, float hCommand, float uCommand, float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, hCommand);
-	_mav_put_float(buf, 5, uCommand);
-	_mav_put_float(buf, 9, rCommand);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.target = target;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MID_LVL_CMDS;
-	return mavlink_finalize_message(msg, system_id, component_id, 13);
-}
-
-/**
- * @brief Pack a mid_lvl_cmds message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,float hCommand,float uCommand,float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, hCommand);
-	_mav_put_float(buf, 5, uCommand);
-	_mav_put_float(buf, 9, rCommand);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.target = target;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MID_LVL_CMDS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 13);
-}
-
-/**
- * @brief Encode a mid_lvl_cmds struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param mid_lvl_cmds C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_mid_lvl_cmds_t* mid_lvl_cmds)
-{
-	return mavlink_msg_mid_lvl_cmds_pack(system_id, component_id, msg, mid_lvl_cmds->target, mid_lvl_cmds->hCommand, mid_lvl_cmds->uCommand, mid_lvl_cmds->rCommand);
-}
-
-/**
- * @brief Send a mid_lvl_cmds message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_mid_lvl_cmds_send(mavlink_channel_t chan, uint8_t target, float hCommand, float uCommand, float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_float(buf, 1, hCommand);
-	_mav_put_float(buf, 5, uCommand);
-	_mav_put_float(buf, 9, rCommand);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MID_LVL_CMDS, buf, 13);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.target = target;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MID_LVL_CMDS, (const char *)&packet, 13);
-#endif
-}
-
-#endif
-
-// MESSAGE MID_LVL_CMDS UNPACKING
-
-
-/**
- * @brief Get field target from mid_lvl_cmds message
- *
- * @return The system setting the commands
- */
-static inline uint8_t mavlink_msg_mid_lvl_cmds_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field hCommand from mid_lvl_cmds message
- *
- * @return Commanded Airspeed
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_hCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  1);
-}
-
-/**
- * @brief Get field uCommand from mid_lvl_cmds message
- *
- * @return Log value 2 
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_uCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  5);
-}
-
-/**
- * @brief Get field rCommand from mid_lvl_cmds message
- *
- * @return Log value 3 
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_rCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  9);
-}
-
-/**
- * @brief Decode a mid_lvl_cmds message into a struct
- *
- * @param msg The message to decode
- * @param mid_lvl_cmds C-struct to decode the message contents into
- */
-static inline void mavlink_msg_mid_lvl_cmds_decode(const mavlink_message_t* msg, mavlink_mid_lvl_cmds_t* mid_lvl_cmds)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mid_lvl_cmds->target = mavlink_msg_mid_lvl_cmds_get_target(msg);
-	mid_lvl_cmds->hCommand = mavlink_msg_mid_lvl_cmds_get_hCommand(msg);
-	mid_lvl_cmds->uCommand = mavlink_msg_mid_lvl_cmds_get_uCommand(msg);
-	mid_lvl_cmds->rCommand = mavlink_msg_mid_lvl_cmds_get_rCommand(msg);
-#else
-	memcpy(mid_lvl_cmds, _MAV_PAYLOAD(msg), 13);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_sensor_bias.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_sensor_bias.h
deleted file mode 100644
index 7afb96bd6..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_sensor_bias.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE SENSOR_BIAS PACKING
-
-#define MAVLINK_MSG_ID_SENSOR_BIAS 172
-
-typedef struct __mavlink_sensor_bias_t
-{
- float axBias; ///< Accelerometer X bias (m/s)
- float ayBias; ///< Accelerometer Y bias (m/s)
- float azBias; ///< Accelerometer Z bias (m/s)
- float gxBias; ///< Gyro X bias (rad/s)
- float gyBias; ///< Gyro Y bias (rad/s)
- float gzBias; ///< Gyro Z bias (rad/s)
-} mavlink_sensor_bias_t;
-
-#define MAVLINK_MSG_ID_SENSOR_BIAS_LEN 24
-#define MAVLINK_MSG_ID_172_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_SENSOR_BIAS { \
-	"SENSOR_BIAS", \
-	6, \
-	{  { "axBias", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_sensor_bias_t, axBias) }, \
-         { "ayBias", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_sensor_bias_t, ayBias) }, \
-         { "azBias", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_sensor_bias_t, azBias) }, \
-         { "gxBias", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_sensor_bias_t, gxBias) }, \
-         { "gyBias", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_sensor_bias_t, gyBias) }, \
-         { "gzBias", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_sensor_bias_t, gzBias) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a sensor_bias message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_bias_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float axBias, float ayBias, float azBias, float gxBias, float gyBias, float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_BIAS;
-	return mavlink_finalize_message(msg, system_id, component_id, 24);
-}
-
-/**
- * @brief Pack a sensor_bias message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_bias_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float axBias,float ayBias,float azBias,float gxBias,float gyBias,float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_BIAS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24);
-}
-
-/**
- * @brief Encode a sensor_bias struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param sensor_bias C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_sensor_bias_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_sensor_bias_t* sensor_bias)
-{
-	return mavlink_msg_sensor_bias_pack(system_id, component_id, msg, sensor_bias->axBias, sensor_bias->ayBias, sensor_bias->azBias, sensor_bias->gxBias, sensor_bias->gyBias, sensor_bias->gzBias);
-}
-
-/**
- * @brief Send a sensor_bias message
- * @param chan MAVLink channel to send the message
- *
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_sensor_bias_send(mavlink_channel_t chan, float axBias, float ayBias, float azBias, float gxBias, float gyBias, float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_BIAS, buf, 24);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_BIAS, (const char *)&packet, 24);
-#endif
-}
-
-#endif
-
-// MESSAGE SENSOR_BIAS UNPACKING
-
-
-/**
- * @brief Get field axBias from sensor_bias message
- *
- * @return Accelerometer X bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_axBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field ayBias from sensor_bias message
- *
- * @return Accelerometer Y bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_ayBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field azBias from sensor_bias message
- *
- * @return Accelerometer Z bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_azBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field gxBias from sensor_bias message
- *
- * @return Gyro X bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gxBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field gyBias from sensor_bias message
- *
- * @return Gyro Y bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gyBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field gzBias from sensor_bias message
- *
- * @return Gyro Z bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gzBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a sensor_bias message into a struct
- *
- * @param msg The message to decode
- * @param sensor_bias C-struct to decode the message contents into
- */
-static inline void mavlink_msg_sensor_bias_decode(const mavlink_message_t* msg, mavlink_sensor_bias_t* sensor_bias)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	sensor_bias->axBias = mavlink_msg_sensor_bias_get_axBias(msg);
-	sensor_bias->ayBias = mavlink_msg_sensor_bias_get_ayBias(msg);
-	sensor_bias->azBias = mavlink_msg_sensor_bias_get_azBias(msg);
-	sensor_bias->gxBias = mavlink_msg_sensor_bias_get_gxBias(msg);
-	sensor_bias->gyBias = mavlink_msg_sensor_bias_get_gyBias(msg);
-	sensor_bias->gzBias = mavlink_msg_sensor_bias_get_gzBias(msg);
-#else
-	memcpy(sensor_bias, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_action.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_action.h
deleted file mode 100644
index da56b98b5..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_action.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE SLUGS_ACTION PACKING
-
-#define MAVLINK_MSG_ID_SLUGS_ACTION 183
-
-typedef struct __mavlink_slugs_action_t
-{
- uint8_t target; ///< The system reporting the action
- uint8_t actionId; ///< Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- uint16_t actionVal; ///< Value associated with the action
-} mavlink_slugs_action_t;
-
-#define MAVLINK_MSG_ID_SLUGS_ACTION_LEN 4
-#define MAVLINK_MSG_ID_183_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_SLUGS_ACTION { \
-	"SLUGS_ACTION", \
-	3, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_slugs_action_t, target) }, \
-         { "actionId", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_slugs_action_t, actionId) }, \
-         { "actionVal", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_slugs_action_t, actionVal) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a slugs_action message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_action_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t actionId, uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, actionId);
-	_mav_put_uint16_t(buf, 2, actionVal);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_slugs_action_t packet;
-	packet.target = target;
-	packet.actionId = actionId;
-	packet.actionVal = actionVal;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_ACTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 4);
-}
-
-/**
- * @brief Pack a slugs_action message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_action_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t actionId,uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, actionId);
-	_mav_put_uint16_t(buf, 2, actionVal);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_slugs_action_t packet;
-	packet.target = target;
-	packet.actionId = actionId;
-	packet.actionVal = actionVal;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_ACTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
-}
-
-/**
- * @brief Encode a slugs_action struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param slugs_action C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_slugs_action_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_slugs_action_t* slugs_action)
-{
-	return mavlink_msg_slugs_action_pack(system_id, component_id, msg, slugs_action->target, slugs_action->actionId, slugs_action->actionVal);
-}
-
-/**
- * @brief Send a slugs_action message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_slugs_action_send(mavlink_channel_t chan, uint8_t target, uint8_t actionId, uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, actionId);
-	_mav_put_uint16_t(buf, 2, actionVal);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_ACTION, buf, 4);
-#else
-	mavlink_slugs_action_t packet;
-	packet.target = target;
-	packet.actionId = actionId;
-	packet.actionVal = actionVal;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_ACTION, (const char *)&packet, 4);
-#endif
-}
-
-#endif
-
-// MESSAGE SLUGS_ACTION UNPACKING
-
-
-/**
- * @brief Get field target from slugs_action message
- *
- * @return The system reporting the action
- */
-static inline uint8_t mavlink_msg_slugs_action_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field actionId from slugs_action message
- *
- * @return Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- */
-static inline uint8_t mavlink_msg_slugs_action_get_actionId(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field actionVal from slugs_action message
- *
- * @return Value associated with the action
- */
-static inline uint16_t mavlink_msg_slugs_action_get_actionVal(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  2);
-}
-
-/**
- * @brief Decode a slugs_action message into a struct
- *
- * @param msg The message to decode
- * @param slugs_action C-struct to decode the message contents into
- */
-static inline void mavlink_msg_slugs_action_decode(const mavlink_message_t* msg, mavlink_slugs_action_t* slugs_action)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	slugs_action->target = mavlink_msg_slugs_action_get_target(msg);
-	slugs_action->actionId = mavlink_msg_slugs_action_get_actionId(msg);
-	slugs_action->actionVal = mavlink_msg_slugs_action_get_actionVal(msg);
-#else
-	memcpy(slugs_action, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_navigation.h b/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_navigation.h
deleted file mode 100644
index b81bde72f..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/mavlink_msg_slugs_navigation.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE SLUGS_NAVIGATION PACKING
-
-#define MAVLINK_MSG_ID_SLUGS_NAVIGATION 176
-
-typedef struct __mavlink_slugs_navigation_t
-{
- float u_m; ///< Measured Airspeed prior to the Nav Filter
- float phi_c; ///< Commanded Roll
- float theta_c; ///< Commanded Pitch
- float psiDot_c; ///< Commanded Turn rate
- float ay_body; ///< Y component of the body acceleration
- float totalDist; ///< Total Distance to Run on this leg of Navigation
- float dist2Go; ///< Remaining distance to Run on this leg of Navigation
- uint8_t fromWP; ///< Origin WP
- uint8_t toWP; ///< Destination WP
-} mavlink_slugs_navigation_t;
-
-#define MAVLINK_MSG_ID_SLUGS_NAVIGATION_LEN 30
-#define MAVLINK_MSG_ID_176_LEN 30
-
-
-
-#define MAVLINK_MESSAGE_INFO_SLUGS_NAVIGATION { \
-	"SLUGS_NAVIGATION", \
-	9, \
-	{  { "u_m", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_slugs_navigation_t, u_m) }, \
-         { "phi_c", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_slugs_navigation_t, phi_c) }, \
-         { "theta_c", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_slugs_navigation_t, theta_c) }, \
-         { "psiDot_c", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_slugs_navigation_t, psiDot_c) }, \
-         { "ay_body", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_slugs_navigation_t, ay_body) }, \
-         { "totalDist", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_slugs_navigation_t, totalDist) }, \
-         { "dist2Go", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_slugs_navigation_t, dist2Go) }, \
-         { "fromWP", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_slugs_navigation_t, fromWP) }, \
-         { "toWP", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_slugs_navigation_t, toWP) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a slugs_navigation message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_navigation_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float u_m, float phi_c, float theta_c, float psiDot_c, float ay_body, float totalDist, float dist2Go, uint8_t fromWP, uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_NAVIGATION;
-	return mavlink_finalize_message(msg, system_id, component_id, 30);
-}
-
-/**
- * @brief Pack a slugs_navigation message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_navigation_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float u_m,float phi_c,float theta_c,float psiDot_c,float ay_body,float totalDist,float dist2Go,uint8_t fromWP,uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_NAVIGATION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 30);
-}
-
-/**
- * @brief Encode a slugs_navigation struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param slugs_navigation C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_slugs_navigation_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_slugs_navigation_t* slugs_navigation)
-{
-	return mavlink_msg_slugs_navigation_pack(system_id, component_id, msg, slugs_navigation->u_m, slugs_navigation->phi_c, slugs_navigation->theta_c, slugs_navigation->psiDot_c, slugs_navigation->ay_body, slugs_navigation->totalDist, slugs_navigation->dist2Go, slugs_navigation->fromWP, slugs_navigation->toWP);
-}
-
-/**
- * @brief Send a slugs_navigation message
- * @param chan MAVLink channel to send the message
- *
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_slugs_navigation_send(mavlink_channel_t chan, float u_m, float phi_c, float theta_c, float psiDot_c, float ay_body, float totalDist, float dist2Go, uint8_t fromWP, uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_NAVIGATION, buf, 30);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_NAVIGATION, (const char *)&packet, 30);
-#endif
-}
-
-#endif
-
-// MESSAGE SLUGS_NAVIGATION UNPACKING
-
-
-/**
- * @brief Get field u_m from slugs_navigation message
- *
- * @return Measured Airspeed prior to the Nav Filter
- */
-static inline float mavlink_msg_slugs_navigation_get_u_m(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field phi_c from slugs_navigation message
- *
- * @return Commanded Roll
- */
-static inline float mavlink_msg_slugs_navigation_get_phi_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field theta_c from slugs_navigation message
- *
- * @return Commanded Pitch
- */
-static inline float mavlink_msg_slugs_navigation_get_theta_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field psiDot_c from slugs_navigation message
- *
- * @return Commanded Turn rate
- */
-static inline float mavlink_msg_slugs_navigation_get_psiDot_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field ay_body from slugs_navigation message
- *
- * @return Y component of the body acceleration
- */
-static inline float mavlink_msg_slugs_navigation_get_ay_body(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field totalDist from slugs_navigation message
- *
- * @return Total Distance to Run on this leg of Navigation
- */
-static inline float mavlink_msg_slugs_navigation_get_totalDist(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field dist2Go from slugs_navigation message
- *
- * @return Remaining distance to Run on this leg of Navigation
- */
-static inline float mavlink_msg_slugs_navigation_get_dist2Go(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field fromWP from slugs_navigation message
- *
- * @return Origin WP
- */
-static inline uint8_t mavlink_msg_slugs_navigation_get_fromWP(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  28);
-}
-
-/**
- * @brief Get field toWP from slugs_navigation message
- *
- * @return Destination WP
- */
-static inline uint8_t mavlink_msg_slugs_navigation_get_toWP(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  29);
-}
-
-/**
- * @brief Decode a slugs_navigation message into a struct
- *
- * @param msg The message to decode
- * @param slugs_navigation C-struct to decode the message contents into
- */
-static inline void mavlink_msg_slugs_navigation_decode(const mavlink_message_t* msg, mavlink_slugs_navigation_t* slugs_navigation)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	slugs_navigation->u_m = mavlink_msg_slugs_navigation_get_u_m(msg);
-	slugs_navigation->phi_c = mavlink_msg_slugs_navigation_get_phi_c(msg);
-	slugs_navigation->theta_c = mavlink_msg_slugs_navigation_get_theta_c(msg);
-	slugs_navigation->psiDot_c = mavlink_msg_slugs_navigation_get_psiDot_c(msg);
-	slugs_navigation->ay_body = mavlink_msg_slugs_navigation_get_ay_body(msg);
-	slugs_navigation->totalDist = mavlink_msg_slugs_navigation_get_totalDist(msg);
-	slugs_navigation->dist2Go = mavlink_msg_slugs_navigation_get_dist2Go(msg);
-	slugs_navigation->fromWP = mavlink_msg_slugs_navigation_get_fromWP(msg);
-	slugs_navigation->toWP = mavlink_msg_slugs_navigation_get_toWP(msg);
-#else
-	memcpy(slugs_navigation, _MAV_PAYLOAD(msg), 30);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/slugs/slugs.h b/mavlink/include/mavlink/v0.9/slugs/slugs.h
deleted file mode 100644
index 27f4e10be..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/slugs.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from slugs.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef SLUGS_H
-#define SLUGS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 4, 8, 14, 8, 28, 3, 32, 0, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 19, 2, 23, 21, 0, 37, 26, 101, 26, 16, 32, 32, 37, 32, 11, 17, 17, 16, 18, 36, 4, 4, 2, 2, 4, 2, 2, 3, 14, 12, 18, 16, 8, 27, 25, 18, 18, 24, 24, 0, 0, 0, 26, 16, 36, 5, 6, 56, 26, 21, 18, 0, 0, 18, 20, 20, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 10, 24, 18, 0, 0, 30, 24, 0, 7, 13, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 14, 14, 51, 5}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 39, 190, 92, 191, 217, 104, 119, 0, 219, 60, 186, 10, 0, 0, 0, 0, 0, 0, 0, 89, 159, 162, 121, 0, 149, 222, 110, 179, 136, 66, 126, 185, 147, 112, 252, 162, 215, 229, 128, 9, 106, 101, 213, 4, 229, 21, 214, 215, 14, 206, 50, 157, 126, 108, 213, 95, 5, 127, 0, 0, 0, 57, 126, 130, 119, 193, 191, 236, 158, 143, 0, 0, 104, 123, 131, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 150, 232, 168, 2, 0, 0, 120, 167, 0, 16, 2, 52, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 224, 60, 106, 7}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_BOOT, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACTION_ACK, MAVLINK_MESSAGE_INFO_ACTION, MAVLINK_MESSAGE_INFO_SET_MODE, MAVLINK_MESSAGE_INFO_SET_NAV_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_LOCAL_POSITION, MAVLINK_MESSAGE_INFO_GPS_RAW, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_WAYPOINT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST, MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST, MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT, MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL, MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED, MAVLINK_MESSAGE_INFO_WAYPOINT_ACK, MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_CONTROL_STATUS, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_POSITION_TARGET, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, MAVLINK_MESSAGE_INFO_SET_ALTITUDE, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_VFR_HUD, MAVLINK_MESSAGE_INFO_COMMAND, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CPU_LOAD, MAVLINK_MESSAGE_INFO_AIR_DATA, MAVLINK_MESSAGE_INFO_SENSOR_BIAS, MAVLINK_MESSAGE_INFO_DIAGNOSTIC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SLUGS_NAVIGATION, MAVLINK_MESSAGE_INFO_DATA_LOG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_DATE_TIME, MAVLINK_MESSAGE_INFO_MID_LVL_CMDS, MAVLINK_MESSAGE_INFO_CTRL_SRFC_PT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SLUGS_ACTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_SLUGS
-
-#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
-
-
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_cpu_load.h"
-#include "./mavlink_msg_air_data.h"
-#include "./mavlink_msg_sensor_bias.h"
-#include "./mavlink_msg_diagnostic.h"
-#include "./mavlink_msg_slugs_navigation.h"
-#include "./mavlink_msg_data_log.h"
-#include "./mavlink_msg_gps_date_time.h"
-#include "./mavlink_msg_mid_lvl_cmds.h"
-#include "./mavlink_msg_ctrl_srfc_pt.h"
-#include "./mavlink_msg_slugs_action.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // SLUGS_H
diff --git a/mavlink/include/mavlink/v0.9/slugs/testsuite.h b/mavlink/include/mavlink/v0.9/slugs/testsuite.h
deleted file mode 100644
index d1596a816..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/testsuite.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from slugs.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef SLUGS_TESTSUITE_H
-#define SLUGS_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_slugs(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_slugs(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_cpu_load(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_cpu_load_t packet_in = {
-		5,
-	72,
-	17339,
-	};
-	mavlink_cpu_load_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.sensLoad = packet_in.sensLoad;
-        	packet1.ctrlLoad = packet_in.ctrlLoad;
-        	packet1.batVolt = packet_in.batVolt;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_pack(system_id, component_id, &msg , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_cpu_load_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_send(MAVLINK_COMM_1 , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_air_data(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_air_data_t packet_in = {
-		17.0,
-	45.0,
-	17651,
-	};
-	mavlink_air_data_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.dynamicPressure = packet_in.dynamicPressure;
-        	packet1.staticPressure = packet_in.staticPressure;
-        	packet1.temperature = packet_in.temperature;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_pack(system_id, component_id, &msg , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_air_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_send(MAVLINK_COMM_1 , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_sensor_bias(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_sensor_bias_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_sensor_bias_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.axBias = packet_in.axBias;
-        	packet1.ayBias = packet_in.ayBias;
-        	packet1.azBias = packet_in.azBias;
-        	packet1.gxBias = packet_in.gxBias;
-        	packet1.gyBias = packet_in.gyBias;
-        	packet1.gzBias = packet_in.gzBias;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_pack(system_id, component_id, &msg , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_sensor_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_send(MAVLINK_COMM_1 , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_diagnostic(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_diagnostic_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	17859,
-	17963,
-	18067,
-	};
-	mavlink_diagnostic_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.diagFl1 = packet_in.diagFl1;
-        	packet1.diagFl2 = packet_in.diagFl2;
-        	packet1.diagFl3 = packet_in.diagFl3;
-        	packet1.diagSh1 = packet_in.diagSh1;
-        	packet1.diagSh2 = packet_in.diagSh2;
-        	packet1.diagSh3 = packet_in.diagSh3;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_pack(system_id, component_id, &msg , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_diagnostic_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_send(MAVLINK_COMM_1 , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs_navigation(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_slugs_navigation_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	89,
-	156,
-	};
-	mavlink_slugs_navigation_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.u_m = packet_in.u_m;
-        	packet1.phi_c = packet_in.phi_c;
-        	packet1.theta_c = packet_in.theta_c;
-        	packet1.psiDot_c = packet_in.psiDot_c;
-        	packet1.ay_body = packet_in.ay_body;
-        	packet1.totalDist = packet_in.totalDist;
-        	packet1.dist2Go = packet_in.dist2Go;
-        	packet1.fromWP = packet_in.fromWP;
-        	packet1.toWP = packet_in.toWP;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_pack(system_id, component_id, &msg , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_slugs_navigation_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_send(MAVLINK_COMM_1 , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_data_log(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_data_log_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_data_log_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.fl_1 = packet_in.fl_1;
-        	packet1.fl_2 = packet_in.fl_2;
-        	packet1.fl_3 = packet_in.fl_3;
-        	packet1.fl_4 = packet_in.fl_4;
-        	packet1.fl_5 = packet_in.fl_5;
-        	packet1.fl_6 = packet_in.fl_6;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_pack(system_id, component_id, &msg , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_data_log_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_send(MAVLINK_COMM_1 , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_date_time(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_date_time_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	84,
-	151,
-	};
-	mavlink_gps_date_time_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.year = packet_in.year;
-        	packet1.month = packet_in.month;
-        	packet1.day = packet_in.day;
-        	packet1.hour = packet_in.hour;
-        	packet1.min = packet_in.min;
-        	packet1.sec = packet_in.sec;
-        	packet1.visSat = packet_in.visSat;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_pack(system_id, component_id, &msg , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_date_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_send(MAVLINK_COMM_1 , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_mid_lvl_cmds(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_mid_lvl_cmds_t packet_in = {
-		5,
-	24.0,
-	52.0,
-	80.0,
-	};
-	mavlink_mid_lvl_cmds_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.hCommand = packet_in.hCommand;
-        	packet1.uCommand = packet_in.uCommand;
-        	packet1.rCommand = packet_in.rCommand;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_pack(system_id, component_id, &msg , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_mid_lvl_cmds_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_send(MAVLINK_COMM_1 , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ctrl_srfc_pt(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ctrl_srfc_pt_t packet_in = {
-		5,
-	17287,
-	};
-	mavlink_ctrl_srfc_pt_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.bitfieldPt = packet_in.bitfieldPt;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_pack(system_id, component_id, &msg , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ctrl_srfc_pt_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_send(MAVLINK_COMM_1 , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs_action(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_slugs_action_t packet_in = {
-		5,
-	72,
-	17339,
-	};
-	mavlink_slugs_action_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.target = packet_in.target;
-        	packet1.actionId = packet_in.actionId;
-        	packet1.actionVal = packet_in.actionVal;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_pack(system_id, component_id, &msg , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_slugs_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_send(MAVLINK_COMM_1 , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_cpu_load(system_id, component_id, last_msg);
-	mavlink_test_air_data(system_id, component_id, last_msg);
-	mavlink_test_sensor_bias(system_id, component_id, last_msg);
-	mavlink_test_diagnostic(system_id, component_id, last_msg);
-	mavlink_test_slugs_navigation(system_id, component_id, last_msg);
-	mavlink_test_data_log(system_id, component_id, last_msg);
-	mavlink_test_gps_date_time(system_id, component_id, last_msg);
-	mavlink_test_mid_lvl_cmds(system_id, component_id, last_msg);
-	mavlink_test_ctrl_srfc_pt(system_id, component_id, last_msg);
-	mavlink_test_slugs_action(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // SLUGS_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/slugs/version.h b/mavlink/include/mavlink/v0.9/slugs/version.h
deleted file mode 100644
index e0ad15000..000000000
--- a/mavlink/include/mavlink/v0.9/slugs/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from slugs.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:52 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/test/mavlink.h b/mavlink/include/mavlink/v0.9/test/mavlink.h
deleted file mode 100644
index 5b91bfe2d..000000000
--- a/mavlink/include/mavlink/v0.9/test/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from test.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "test.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/test/mavlink_msg_test_types.h b/mavlink/include/mavlink/v0.9/test/mavlink_msg_test_types.h
deleted file mode 100644
index fb8c5ee1f..000000000
--- a/mavlink/include/mavlink/v0.9/test/mavlink_msg_test_types.h
+++ /dev/null
@@ -1,610 +0,0 @@
-// MESSAGE TEST_TYPES PACKING
-
-#define MAVLINK_MSG_ID_TEST_TYPES 0
-
-typedef struct __mavlink_test_types_t
-{
- char c; ///< char
- char s[10]; ///< string
- uint8_t u8; ///< uint8_t
- uint16_t u16; ///< uint16_t
- uint32_t u32; ///< uint32_t
- uint64_t u64; ///< uint64_t
- int8_t s8; ///< int8_t
- int16_t s16; ///< int16_t
- int32_t s32; ///< int32_t
- int64_t s64; ///< int64_t
- float f; ///< float
- double d; ///< double
- uint8_t u8_array[3]; ///< uint8_t_array
- uint16_t u16_array[3]; ///< uint16_t_array
- uint32_t u32_array[3]; ///< uint32_t_array
- uint64_t u64_array[3]; ///< uint64_t_array
- int8_t s8_array[3]; ///< int8_t_array
- int16_t s16_array[3]; ///< int16_t_array
- int32_t s32_array[3]; ///< int32_t_array
- int64_t s64_array[3]; ///< int64_t_array
- float f_array[3]; ///< float_array
- double d_array[3]; ///< double_array
-} mavlink_test_types_t;
-
-#define MAVLINK_MSG_ID_TEST_TYPES_LEN 179
-#define MAVLINK_MSG_ID_0_LEN 179
-
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S_LEN 10
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U8_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U16_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U32_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U64_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S8_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S16_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S32_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S64_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_F_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_D_ARRAY_LEN 3
-
-#define MAVLINK_MESSAGE_INFO_TEST_TYPES { \
-	"TEST_TYPES", \
-	22, \
-	{  { "c", NULL, MAVLINK_TYPE_CHAR, 0, 0, offsetof(mavlink_test_types_t, c) }, \
-         { "s", NULL, MAVLINK_TYPE_CHAR, 10, 1, offsetof(mavlink_test_types_t, s) }, \
-         { "u8", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_test_types_t, u8) }, \
-         { "u16", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_test_types_t, u16) }, \
-         { "u32", "0x%08x", MAVLINK_TYPE_UINT32_T, 0, 14, offsetof(mavlink_test_types_t, u32) }, \
-         { "u64", NULL, MAVLINK_TYPE_UINT64_T, 0, 18, offsetof(mavlink_test_types_t, u64) }, \
-         { "s8", NULL, MAVLINK_TYPE_INT8_T, 0, 26, offsetof(mavlink_test_types_t, s8) }, \
-         { "s16", NULL, MAVLINK_TYPE_INT16_T, 0, 27, offsetof(mavlink_test_types_t, s16) }, \
-         { "s32", NULL, MAVLINK_TYPE_INT32_T, 0, 29, offsetof(mavlink_test_types_t, s32) }, \
-         { "s64", NULL, MAVLINK_TYPE_INT64_T, 0, 33, offsetof(mavlink_test_types_t, s64) }, \
-         { "f", NULL, MAVLINK_TYPE_FLOAT, 0, 41, offsetof(mavlink_test_types_t, f) }, \
-         { "d", NULL, MAVLINK_TYPE_DOUBLE, 0, 45, offsetof(mavlink_test_types_t, d) }, \
-         { "u8_array", NULL, MAVLINK_TYPE_UINT8_T, 3, 53, offsetof(mavlink_test_types_t, u8_array) }, \
-         { "u16_array", NULL, MAVLINK_TYPE_UINT16_T, 3, 56, offsetof(mavlink_test_types_t, u16_array) }, \
-         { "u32_array", NULL, MAVLINK_TYPE_UINT32_T, 3, 62, offsetof(mavlink_test_types_t, u32_array) }, \
-         { "u64_array", NULL, MAVLINK_TYPE_UINT64_T, 3, 74, offsetof(mavlink_test_types_t, u64_array) }, \
-         { "s8_array", NULL, MAVLINK_TYPE_INT8_T, 3, 98, offsetof(mavlink_test_types_t, s8_array) }, \
-         { "s16_array", NULL, MAVLINK_TYPE_INT16_T, 3, 101, offsetof(mavlink_test_types_t, s16_array) }, \
-         { "s32_array", NULL, MAVLINK_TYPE_INT32_T, 3, 107, offsetof(mavlink_test_types_t, s32_array) }, \
-         { "s64_array", NULL, MAVLINK_TYPE_INT64_T, 3, 119, offsetof(mavlink_test_types_t, s64_array) }, \
-         { "f_array", NULL, MAVLINK_TYPE_FLOAT, 3, 143, offsetof(mavlink_test_types_t, f_array) }, \
-         { "d_array", NULL, MAVLINK_TYPE_DOUBLE, 3, 155, offsetof(mavlink_test_types_t, d_array) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a test_types message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_test_types_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       char c, const char *s, uint8_t u8, uint16_t u16, uint32_t u32, uint64_t u64, int8_t s8, int16_t s16, int32_t s32, int64_t s64, float f, double d, const uint8_t *u8_array, const uint16_t *u16_array, const uint32_t *u32_array, const uint64_t *u64_array, const int8_t *s8_array, const int16_t *s16_array, const int32_t *s32_array, const int64_t *s64_array, const float *f_array, const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_char(buf, 0, c);
-	_mav_put_uint8_t(buf, 11, u8);
-	_mav_put_uint16_t(buf, 12, u16);
-	_mav_put_uint32_t(buf, 14, u32);
-	_mav_put_uint64_t(buf, 18, u64);
-	_mav_put_int8_t(buf, 26, s8);
-	_mav_put_int16_t(buf, 27, s16);
-	_mav_put_int32_t(buf, 29, s32);
-	_mav_put_int64_t(buf, 33, s64);
-	_mav_put_float(buf, 41, f);
-	_mav_put_double(buf, 45, d);
-	_mav_put_char_array(buf, 1, s, 10);
-	_mav_put_uint8_t_array(buf, 53, u8_array, 3);
-	_mav_put_uint16_t_array(buf, 56, u16_array, 3);
-	_mav_put_uint32_t_array(buf, 62, u32_array, 3);
-	_mav_put_uint64_t_array(buf, 74, u64_array, 3);
-	_mav_put_int8_t_array(buf, 98, s8_array, 3);
-	_mav_put_int16_t_array(buf, 101, s16_array, 3);
-	_mav_put_int32_t_array(buf, 107, s32_array, 3);
-	_mav_put_int64_t_array(buf, 119, s64_array, 3);
-	_mav_put_float_array(buf, 143, f_array, 3);
-	_mav_put_double_array(buf, 155, d_array, 3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 179);
-#else
-	mavlink_test_types_t packet;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.u16 = u16;
-	packet.u32 = u32;
-	packet.u64 = u64;
-	packet.s8 = s8;
-	packet.s16 = s16;
-	packet.s32 = s32;
-	packet.s64 = s64;
-	packet.f = f;
-	packet.d = d;
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 179);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_TEST_TYPES;
-	return mavlink_finalize_message(msg, system_id, component_id, 179);
-}
-
-/**
- * @brief Pack a test_types message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_test_types_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           char c,const char *s,uint8_t u8,uint16_t u16,uint32_t u32,uint64_t u64,int8_t s8,int16_t s16,int32_t s32,int64_t s64,float f,double d,const uint8_t *u8_array,const uint16_t *u16_array,const uint32_t *u32_array,const uint64_t *u64_array,const int8_t *s8_array,const int16_t *s16_array,const int32_t *s32_array,const int64_t *s64_array,const float *f_array,const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_char(buf, 0, c);
-	_mav_put_uint8_t(buf, 11, u8);
-	_mav_put_uint16_t(buf, 12, u16);
-	_mav_put_uint32_t(buf, 14, u32);
-	_mav_put_uint64_t(buf, 18, u64);
-	_mav_put_int8_t(buf, 26, s8);
-	_mav_put_int16_t(buf, 27, s16);
-	_mav_put_int32_t(buf, 29, s32);
-	_mav_put_int64_t(buf, 33, s64);
-	_mav_put_float(buf, 41, f);
-	_mav_put_double(buf, 45, d);
-	_mav_put_char_array(buf, 1, s, 10);
-	_mav_put_uint8_t_array(buf, 53, u8_array, 3);
-	_mav_put_uint16_t_array(buf, 56, u16_array, 3);
-	_mav_put_uint32_t_array(buf, 62, u32_array, 3);
-	_mav_put_uint64_t_array(buf, 74, u64_array, 3);
-	_mav_put_int8_t_array(buf, 98, s8_array, 3);
-	_mav_put_int16_t_array(buf, 101, s16_array, 3);
-	_mav_put_int32_t_array(buf, 107, s32_array, 3);
-	_mav_put_int64_t_array(buf, 119, s64_array, 3);
-	_mav_put_float_array(buf, 143, f_array, 3);
-	_mav_put_double_array(buf, 155, d_array, 3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 179);
-#else
-	mavlink_test_types_t packet;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.u16 = u16;
-	packet.u32 = u32;
-	packet.u64 = u64;
-	packet.s8 = s8;
-	packet.s16 = s16;
-	packet.s32 = s32;
-	packet.s64 = s64;
-	packet.f = f;
-	packet.d = d;
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 179);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_TEST_TYPES;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 179);
-}
-
-/**
- * @brief Encode a test_types struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param test_types C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_test_types_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_test_types_t* test_types)
-{
-	return mavlink_msg_test_types_pack(system_id, component_id, msg, test_types->c, test_types->s, test_types->u8, test_types->u16, test_types->u32, test_types->u64, test_types->s8, test_types->s16, test_types->s32, test_types->s64, test_types->f, test_types->d, test_types->u8_array, test_types->u16_array, test_types->u32_array, test_types->u64_array, test_types->s8_array, test_types->s16_array, test_types->s32_array, test_types->s64_array, test_types->f_array, test_types->d_array);
-}
-
-/**
- * @brief Send a test_types message
- * @param chan MAVLink channel to send the message
- *
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_test_types_send(mavlink_channel_t chan, char c, const char *s, uint8_t u8, uint16_t u16, uint32_t u32, uint64_t u64, int8_t s8, int16_t s16, int32_t s32, int64_t s64, float f, double d, const uint8_t *u8_array, const uint16_t *u16_array, const uint32_t *u32_array, const uint64_t *u64_array, const int8_t *s8_array, const int16_t *s16_array, const int32_t *s32_array, const int64_t *s64_array, const float *f_array, const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_char(buf, 0, c);
-	_mav_put_uint8_t(buf, 11, u8);
-	_mav_put_uint16_t(buf, 12, u16);
-	_mav_put_uint32_t(buf, 14, u32);
-	_mav_put_uint64_t(buf, 18, u64);
-	_mav_put_int8_t(buf, 26, s8);
-	_mav_put_int16_t(buf, 27, s16);
-	_mav_put_int32_t(buf, 29, s32);
-	_mav_put_int64_t(buf, 33, s64);
-	_mav_put_float(buf, 41, f);
-	_mav_put_double(buf, 45, d);
-	_mav_put_char_array(buf, 1, s, 10);
-	_mav_put_uint8_t_array(buf, 53, u8_array, 3);
-	_mav_put_uint16_t_array(buf, 56, u16_array, 3);
-	_mav_put_uint32_t_array(buf, 62, u32_array, 3);
-	_mav_put_uint64_t_array(buf, 74, u64_array, 3);
-	_mav_put_int8_t_array(buf, 98, s8_array, 3);
-	_mav_put_int16_t_array(buf, 101, s16_array, 3);
-	_mav_put_int32_t_array(buf, 107, s32_array, 3);
-	_mav_put_int64_t_array(buf, 119, s64_array, 3);
-	_mav_put_float_array(buf, 143, f_array, 3);
-	_mav_put_double_array(buf, 155, d_array, 3);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_TEST_TYPES, buf, 179);
-#else
-	mavlink_test_types_t packet;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.u16 = u16;
-	packet.u32 = u32;
-	packet.u64 = u64;
-	packet.s8 = s8;
-	packet.s16 = s16;
-	packet.s32 = s32;
-	packet.s64 = s64;
-	packet.f = f;
-	packet.d = d;
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_TEST_TYPES, (const char *)&packet, 179);
-#endif
-}
-
-#endif
-
-// MESSAGE TEST_TYPES UNPACKING
-
-
-/**
- * @brief Get field c from test_types message
- *
- * @return char
- */
-static inline char mavlink_msg_test_types_get_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_char(msg,  0);
-}
-
-/**
- * @brief Get field s from test_types message
- *
- * @return string
- */
-static inline uint16_t mavlink_msg_test_types_get_s(const mavlink_message_t* msg, char *s)
-{
-	return _MAV_RETURN_char_array(msg, s, 10,  1);
-}
-
-/**
- * @brief Get field u8 from test_types message
- *
- * @return uint8_t
- */
-static inline uint8_t mavlink_msg_test_types_get_u8(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  11);
-}
-
-/**
- * @brief Get field u16 from test_types message
- *
- * @return uint16_t
- */
-static inline uint16_t mavlink_msg_test_types_get_u16(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  12);
-}
-
-/**
- * @brief Get field u32 from test_types message
- *
- * @return uint32_t
- */
-static inline uint32_t mavlink_msg_test_types_get_u32(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  14);
-}
-
-/**
- * @brief Get field u64 from test_types message
- *
- * @return uint64_t
- */
-static inline uint64_t mavlink_msg_test_types_get_u64(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  18);
-}
-
-/**
- * @brief Get field s8 from test_types message
- *
- * @return int8_t
- */
-static inline int8_t mavlink_msg_test_types_get_s8(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int8_t(msg,  26);
-}
-
-/**
- * @brief Get field s16 from test_types message
- *
- * @return int16_t
- */
-static inline int16_t mavlink_msg_test_types_get_s16(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  27);
-}
-
-/**
- * @brief Get field s32 from test_types message
- *
- * @return int32_t
- */
-static inline int32_t mavlink_msg_test_types_get_s32(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  29);
-}
-
-/**
- * @brief Get field s64 from test_types message
- *
- * @return int64_t
- */
-static inline int64_t mavlink_msg_test_types_get_s64(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int64_t(msg,  33);
-}
-
-/**
- * @brief Get field f from test_types message
- *
- * @return float
- */
-static inline float mavlink_msg_test_types_get_f(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  41);
-}
-
-/**
- * @brief Get field d from test_types message
- *
- * @return double
- */
-static inline double mavlink_msg_test_types_get_d(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_double(msg,  45);
-}
-
-/**
- * @brief Get field u8_array from test_types message
- *
- * @return uint8_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u8_array(const mavlink_message_t* msg, uint8_t *u8_array)
-{
-	return _MAV_RETURN_uint8_t_array(msg, u8_array, 3,  53);
-}
-
-/**
- * @brief Get field u16_array from test_types message
- *
- * @return uint16_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u16_array(const mavlink_message_t* msg, uint16_t *u16_array)
-{
-	return _MAV_RETURN_uint16_t_array(msg, u16_array, 3,  56);
-}
-
-/**
- * @brief Get field u32_array from test_types message
- *
- * @return uint32_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u32_array(const mavlink_message_t* msg, uint32_t *u32_array)
-{
-	return _MAV_RETURN_uint32_t_array(msg, u32_array, 3,  62);
-}
-
-/**
- * @brief Get field u64_array from test_types message
- *
- * @return uint64_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u64_array(const mavlink_message_t* msg, uint64_t *u64_array)
-{
-	return _MAV_RETURN_uint64_t_array(msg, u64_array, 3,  74);
-}
-
-/**
- * @brief Get field s8_array from test_types message
- *
- * @return int8_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s8_array(const mavlink_message_t* msg, int8_t *s8_array)
-{
-	return _MAV_RETURN_int8_t_array(msg, s8_array, 3,  98);
-}
-
-/**
- * @brief Get field s16_array from test_types message
- *
- * @return int16_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s16_array(const mavlink_message_t* msg, int16_t *s16_array)
-{
-	return _MAV_RETURN_int16_t_array(msg, s16_array, 3,  101);
-}
-
-/**
- * @brief Get field s32_array from test_types message
- *
- * @return int32_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s32_array(const mavlink_message_t* msg, int32_t *s32_array)
-{
-	return _MAV_RETURN_int32_t_array(msg, s32_array, 3,  107);
-}
-
-/**
- * @brief Get field s64_array from test_types message
- *
- * @return int64_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s64_array(const mavlink_message_t* msg, int64_t *s64_array)
-{
-	return _MAV_RETURN_int64_t_array(msg, s64_array, 3,  119);
-}
-
-/**
- * @brief Get field f_array from test_types message
- *
- * @return float_array
- */
-static inline uint16_t mavlink_msg_test_types_get_f_array(const mavlink_message_t* msg, float *f_array)
-{
-	return _MAV_RETURN_float_array(msg, f_array, 3,  143);
-}
-
-/**
- * @brief Get field d_array from test_types message
- *
- * @return double_array
- */
-static inline uint16_t mavlink_msg_test_types_get_d_array(const mavlink_message_t* msg, double *d_array)
-{
-	return _MAV_RETURN_double_array(msg, d_array, 3,  155);
-}
-
-/**
- * @brief Decode a test_types message into a struct
- *
- * @param msg The message to decode
- * @param test_types C-struct to decode the message contents into
- */
-static inline void mavlink_msg_test_types_decode(const mavlink_message_t* msg, mavlink_test_types_t* test_types)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	test_types->c = mavlink_msg_test_types_get_c(msg);
-	mavlink_msg_test_types_get_s(msg, test_types->s);
-	test_types->u8 = mavlink_msg_test_types_get_u8(msg);
-	test_types->u16 = mavlink_msg_test_types_get_u16(msg);
-	test_types->u32 = mavlink_msg_test_types_get_u32(msg);
-	test_types->u64 = mavlink_msg_test_types_get_u64(msg);
-	test_types->s8 = mavlink_msg_test_types_get_s8(msg);
-	test_types->s16 = mavlink_msg_test_types_get_s16(msg);
-	test_types->s32 = mavlink_msg_test_types_get_s32(msg);
-	test_types->s64 = mavlink_msg_test_types_get_s64(msg);
-	test_types->f = mavlink_msg_test_types_get_f(msg);
-	test_types->d = mavlink_msg_test_types_get_d(msg);
-	mavlink_msg_test_types_get_u8_array(msg, test_types->u8_array);
-	mavlink_msg_test_types_get_u16_array(msg, test_types->u16_array);
-	mavlink_msg_test_types_get_u32_array(msg, test_types->u32_array);
-	mavlink_msg_test_types_get_u64_array(msg, test_types->u64_array);
-	mavlink_msg_test_types_get_s8_array(msg, test_types->s8_array);
-	mavlink_msg_test_types_get_s16_array(msg, test_types->s16_array);
-	mavlink_msg_test_types_get_s32_array(msg, test_types->s32_array);
-	mavlink_msg_test_types_get_s64_array(msg, test_types->s64_array);
-	mavlink_msg_test_types_get_f_array(msg, test_types->f_array);
-	mavlink_msg_test_types_get_d_array(msg, test_types->d_array);
-#else
-	memcpy(test_types, _MAV_PAYLOAD(msg), 179);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/test/test.h b/mavlink/include/mavlink/v0.9/test/test.h
deleted file mode 100644
index cfcf4753e..000000000
--- a/mavlink/include/mavlink/v0.9/test/test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from test.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef TEST_H
-#define TEST_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_TEST_TYPES, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_TEST
-
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
-// ENUM DEFINITIONS
-
-
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_test_types.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // TEST_H
diff --git a/mavlink/include/mavlink/v0.9/test/testsuite.h b/mavlink/include/mavlink/v0.9/test/testsuite.h
deleted file mode 100644
index 9b0fc041b..000000000
--- a/mavlink/include/mavlink/v0.9/test/testsuite.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from test.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef TEST_TESTSUITE_H
-#define TEST_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-
-static void mavlink_test_test(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-
-	mavlink_test_test(system_id, component_id, last_msg);
-}
-#endif
-
-
-
-
-static void mavlink_test_test_types(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_test_types_t packet_in = {
-		'A',
-	"BCDEFGHIJ",
-	230,
-	17859,
-	963498192,
-	93372036854776941ULL,
-	211,
-	18639,
-	963498972,
-	93372036854777886LL,
-	304.0,
-	438.0,
-	{ 228, 229, 230 },
-	{ 20147, 20148, 20149 },
-	{ 963500688, 963500689, 963500690 },
-	{ 93372036854780469, 93372036854780470, 93372036854780471 },
-	{ 171, 172, 173 },
-	{ 22487, 22488, 22489 },
-	{ 963503028, 963503029, 963503030 },
-	{ 93372036854783304, 93372036854783305, 93372036854783306 },
-	{ 1018.0, 1019.0, 1020.0 },
-	{ 1208.0, 1209.0, 1210.0 },
-	};
-	mavlink_test_types_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.c = packet_in.c;
-        	packet1.u8 = packet_in.u8;
-        	packet1.u16 = packet_in.u16;
-        	packet1.u32 = packet_in.u32;
-        	packet1.u64 = packet_in.u64;
-        	packet1.s8 = packet_in.s8;
-        	packet1.s16 = packet_in.s16;
-        	packet1.s32 = packet_in.s32;
-        	packet1.s64 = packet_in.s64;
-        	packet1.f = packet_in.f;
-        	packet1.d = packet_in.d;
-        
-        	mav_array_memcpy(packet1.s, packet_in.s, sizeof(char)*10);
-        	mav_array_memcpy(packet1.u8_array, packet_in.u8_array, sizeof(uint8_t)*3);
-        	mav_array_memcpy(packet1.u16_array, packet_in.u16_array, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.u32_array, packet_in.u32_array, sizeof(uint32_t)*3);
-        	mav_array_memcpy(packet1.u64_array, packet_in.u64_array, sizeof(uint64_t)*3);
-        	mav_array_memcpy(packet1.s8_array, packet_in.s8_array, sizeof(int8_t)*3);
-        	mav_array_memcpy(packet1.s16_array, packet_in.s16_array, sizeof(int16_t)*3);
-        	mav_array_memcpy(packet1.s32_array, packet_in.s32_array, sizeof(int32_t)*3);
-        	mav_array_memcpy(packet1.s64_array, packet_in.s64_array, sizeof(int64_t)*3);
-        	mav_array_memcpy(packet1.f_array, packet_in.f_array, sizeof(float)*3);
-        	mav_array_memcpy(packet1.d_array, packet_in.d_array, sizeof(double)*3);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_pack(system_id, component_id, &msg , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_test_types_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_send(MAVLINK_COMM_1 , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_test(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_test_types(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // TEST_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/test/version.h b/mavlink/include/mavlink/v0.9/test/version.h
deleted file mode 100644
index 1d5777512..000000000
--- a/mavlink/include/mavlink/v0.9/test/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from test.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:53 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v0.9/ualberta/mavlink.h b/mavlink/include/mavlink/v0.9/ualberta/mavlink.h
deleted file mode 100644
index 3d878fec6..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ualberta.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 85
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 0
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 0
-#endif
-
-#include "version.h"
-#include "ualberta.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_nav_filter_bias.h b/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_nav_filter_bias.h
deleted file mode 100644
index d46e1e9d1..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_nav_filter_bias.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE NAV_FILTER_BIAS PACKING
-
-#define MAVLINK_MSG_ID_NAV_FILTER_BIAS 220
-
-typedef struct __mavlink_nav_filter_bias_t
-{
- uint64_t usec; ///< Timestamp (microseconds)
- float accel_0; ///< b_f[0]
- float accel_1; ///< b_f[1]
- float accel_2; ///< b_f[2]
- float gyro_0; ///< b_f[0]
- float gyro_1; ///< b_f[1]
- float gyro_2; ///< b_f[2]
-} mavlink_nav_filter_bias_t;
-
-#define MAVLINK_MSG_ID_NAV_FILTER_BIAS_LEN 32
-#define MAVLINK_MSG_ID_220_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_NAV_FILTER_BIAS { \
-	"NAV_FILTER_BIAS", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_nav_filter_bias_t, usec) }, \
-         { "accel_0", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_nav_filter_bias_t, accel_0) }, \
-         { "accel_1", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_nav_filter_bias_t, accel_1) }, \
-         { "accel_2", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_nav_filter_bias_t, accel_2) }, \
-         { "gyro_0", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_nav_filter_bias_t, gyro_0) }, \
-         { "gyro_1", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_nav_filter_bias_t, gyro_1) }, \
-         { "gyro_2", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_nav_filter_bias_t, gyro_2) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a nav_filter_bias message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float accel_0, float accel_1, float accel_2, float gyro_0, float gyro_1, float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_FILTER_BIAS;
-	return mavlink_finalize_message(msg, system_id, component_id, 32);
-}
-
-/**
- * @brief Pack a nav_filter_bias message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float accel_0,float accel_1,float accel_2,float gyro_0,float gyro_1,float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_FILTER_BIAS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
-}
-
-/**
- * @brief Encode a nav_filter_bias struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param nav_filter_bias C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_nav_filter_bias_t* nav_filter_bias)
-{
-	return mavlink_msg_nav_filter_bias_pack(system_id, component_id, msg, nav_filter_bias->usec, nav_filter_bias->accel_0, nav_filter_bias->accel_1, nav_filter_bias->accel_2, nav_filter_bias->gyro_0, nav_filter_bias->gyro_1, nav_filter_bias->gyro_2);
-}
-
-/**
- * @brief Send a nav_filter_bias message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_nav_filter_bias_send(mavlink_channel_t chan, uint64_t usec, float accel_0, float accel_1, float accel_2, float gyro_0, float gyro_1, float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_FILTER_BIAS, buf, 32);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_FILTER_BIAS, (const char *)&packet, 32);
-#endif
-}
-
-#endif
-
-// MESSAGE NAV_FILTER_BIAS UNPACKING
-
-
-/**
- * @brief Get field usec from nav_filter_bias message
- *
- * @return Timestamp (microseconds)
- */
-static inline uint64_t mavlink_msg_nav_filter_bias_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field accel_0 from nav_filter_bias message
- *
- * @return b_f[0]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_0(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field accel_1 from nav_filter_bias message
- *
- * @return b_f[1]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field accel_2 from nav_filter_bias message
- *
- * @return b_f[2]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field gyro_0 from nav_filter_bias message
- *
- * @return b_f[0]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_0(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field gyro_1 from nav_filter_bias message
- *
- * @return b_f[1]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field gyro_2 from nav_filter_bias message
- *
- * @return b_f[2]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a nav_filter_bias message into a struct
- *
- * @param msg The message to decode
- * @param nav_filter_bias C-struct to decode the message contents into
- */
-static inline void mavlink_msg_nav_filter_bias_decode(const mavlink_message_t* msg, mavlink_nav_filter_bias_t* nav_filter_bias)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	nav_filter_bias->usec = mavlink_msg_nav_filter_bias_get_usec(msg);
-	nav_filter_bias->accel_0 = mavlink_msg_nav_filter_bias_get_accel_0(msg);
-	nav_filter_bias->accel_1 = mavlink_msg_nav_filter_bias_get_accel_1(msg);
-	nav_filter_bias->accel_2 = mavlink_msg_nav_filter_bias_get_accel_2(msg);
-	nav_filter_bias->gyro_0 = mavlink_msg_nav_filter_bias_get_gyro_0(msg);
-	nav_filter_bias->gyro_1 = mavlink_msg_nav_filter_bias_get_gyro_1(msg);
-	nav_filter_bias->gyro_2 = mavlink_msg_nav_filter_bias_get_gyro_2(msg);
-#else
-	memcpy(nav_filter_bias, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_radio_calibration.h b/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_radio_calibration.h
deleted file mode 100644
index 3feb7c8a5..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_radio_calibration.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// MESSAGE RADIO_CALIBRATION PACKING
-
-#define MAVLINK_MSG_ID_RADIO_CALIBRATION 221
-
-typedef struct __mavlink_radio_calibration_t
-{
- uint16_t aileron[3]; ///< Aileron setpoints: left, center, right
- uint16_t elevator[3]; ///< Elevator setpoints: nose down, center, nose up
- uint16_t rudder[3]; ///< Rudder setpoints: nose left, center, nose right
- uint16_t gyro[2]; ///< Tail gyro mode/gain setpoints: heading hold, rate mode
- uint16_t pitch[5]; ///< Pitch curve setpoints (every 25%)
- uint16_t throttle[5]; ///< Throttle curve setpoints (every 25%)
-} mavlink_radio_calibration_t;
-
-#define MAVLINK_MSG_ID_RADIO_CALIBRATION_LEN 42
-#define MAVLINK_MSG_ID_221_LEN 42
-
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_AILERON_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_ELEVATOR_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_RUDDER_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_GYRO_LEN 2
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_PITCH_LEN 5
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_THROTTLE_LEN 5
-
-#define MAVLINK_MESSAGE_INFO_RADIO_CALIBRATION { \
-	"RADIO_CALIBRATION", \
-	6, \
-	{  { "aileron", NULL, MAVLINK_TYPE_UINT16_T, 3, 0, offsetof(mavlink_radio_calibration_t, aileron) }, \
-         { "elevator", NULL, MAVLINK_TYPE_UINT16_T, 3, 6, offsetof(mavlink_radio_calibration_t, elevator) }, \
-         { "rudder", NULL, MAVLINK_TYPE_UINT16_T, 3, 12, offsetof(mavlink_radio_calibration_t, rudder) }, \
-         { "gyro", NULL, MAVLINK_TYPE_UINT16_T, 2, 18, offsetof(mavlink_radio_calibration_t, gyro) }, \
-         { "pitch", NULL, MAVLINK_TYPE_UINT16_T, 5, 22, offsetof(mavlink_radio_calibration_t, pitch) }, \
-         { "throttle", NULL, MAVLINK_TYPE_UINT16_T, 5, 32, offsetof(mavlink_radio_calibration_t, throttle) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a radio_calibration message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_calibration_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const uint16_t *aileron, const uint16_t *elevator, const uint16_t *rudder, const uint16_t *gyro, const uint16_t *pitch, const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO_CALIBRATION;
-	return mavlink_finalize_message(msg, system_id, component_id, 42);
-}
-
-/**
- * @brief Pack a radio_calibration message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_calibration_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const uint16_t *aileron,const uint16_t *elevator,const uint16_t *rudder,const uint16_t *gyro,const uint16_t *pitch,const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO_CALIBRATION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 42);
-}
-
-/**
- * @brief Encode a radio_calibration struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param radio_calibration C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_radio_calibration_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_radio_calibration_t* radio_calibration)
-{
-	return mavlink_msg_radio_calibration_pack(system_id, component_id, msg, radio_calibration->aileron, radio_calibration->elevator, radio_calibration->rudder, radio_calibration->gyro, radio_calibration->pitch, radio_calibration->throttle);
-}
-
-/**
- * @brief Send a radio_calibration message
- * @param chan MAVLink channel to send the message
- *
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_radio_calibration_send(mavlink_channel_t chan, const uint16_t *aileron, const uint16_t *elevator, const uint16_t *rudder, const uint16_t *gyro, const uint16_t *pitch, const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO_CALIBRATION, buf, 42);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO_CALIBRATION, (const char *)&packet, 42);
-#endif
-}
-
-#endif
-
-// MESSAGE RADIO_CALIBRATION UNPACKING
-
-
-/**
- * @brief Get field aileron from radio_calibration message
- *
- * @return Aileron setpoints: left, center, right
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_aileron(const mavlink_message_t* msg, uint16_t *aileron)
-{
-	return _MAV_RETURN_uint16_t_array(msg, aileron, 3,  0);
-}
-
-/**
- * @brief Get field elevator from radio_calibration message
- *
- * @return Elevator setpoints: nose down, center, nose up
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_elevator(const mavlink_message_t* msg, uint16_t *elevator)
-{
-	return _MAV_RETURN_uint16_t_array(msg, elevator, 3,  6);
-}
-
-/**
- * @brief Get field rudder from radio_calibration message
- *
- * @return Rudder setpoints: nose left, center, nose right
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_rudder(const mavlink_message_t* msg, uint16_t *rudder)
-{
-	return _MAV_RETURN_uint16_t_array(msg, rudder, 3,  12);
-}
-
-/**
- * @brief Get field gyro from radio_calibration message
- *
- * @return Tail gyro mode/gain setpoints: heading hold, rate mode
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_gyro(const mavlink_message_t* msg, uint16_t *gyro)
-{
-	return _MAV_RETURN_uint16_t_array(msg, gyro, 2,  18);
-}
-
-/**
- * @brief Get field pitch from radio_calibration message
- *
- * @return Pitch curve setpoints (every 25%)
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_pitch(const mavlink_message_t* msg, uint16_t *pitch)
-{
-	return _MAV_RETURN_uint16_t_array(msg, pitch, 5,  22);
-}
-
-/**
- * @brief Get field throttle from radio_calibration message
- *
- * @return Throttle curve setpoints (every 25%)
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_throttle(const mavlink_message_t* msg, uint16_t *throttle)
-{
-	return _MAV_RETURN_uint16_t_array(msg, throttle, 5,  32);
-}
-
-/**
- * @brief Decode a radio_calibration message into a struct
- *
- * @param msg The message to decode
- * @param radio_calibration C-struct to decode the message contents into
- */
-static inline void mavlink_msg_radio_calibration_decode(const mavlink_message_t* msg, mavlink_radio_calibration_t* radio_calibration)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_radio_calibration_get_aileron(msg, radio_calibration->aileron);
-	mavlink_msg_radio_calibration_get_elevator(msg, radio_calibration->elevator);
-	mavlink_msg_radio_calibration_get_rudder(msg, radio_calibration->rudder);
-	mavlink_msg_radio_calibration_get_gyro(msg, radio_calibration->gyro);
-	mavlink_msg_radio_calibration_get_pitch(msg, radio_calibration->pitch);
-	mavlink_msg_radio_calibration_get_throttle(msg, radio_calibration->throttle);
-#else
-	memcpy(radio_calibration, _MAV_PAYLOAD(msg), 42);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_ualberta_sys_status.h b/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_ualberta_sys_status.h
deleted file mode 100644
index 511ca6b0d..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/mavlink_msg_ualberta_sys_status.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE UALBERTA_SYS_STATUS PACKING
-
-#define MAVLINK_MSG_ID_UALBERTA_SYS_STATUS 222
-
-typedef struct __mavlink_ualberta_sys_status_t
-{
- uint8_t mode; ///< System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- uint8_t nav_mode; ///< Navigation mode, see UALBERTA_NAV_MODE ENUM
- uint8_t pilot; ///< Pilot mode, see UALBERTA_PILOT_MODE
-} mavlink_ualberta_sys_status_t;
-
-#define MAVLINK_MSG_ID_UALBERTA_SYS_STATUS_LEN 3
-#define MAVLINK_MSG_ID_222_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_UALBERTA_SYS_STATUS { \
-	"UALBERTA_SYS_STATUS", \
-	3, \
-	{  { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_ualberta_sys_status_t, mode) }, \
-         { "nav_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_ualberta_sys_status_t, nav_mode) }, \
-         { "pilot", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_ualberta_sys_status_t, pilot) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ualberta_sys_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t mode, uint8_t nav_mode, uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_UALBERTA_SYS_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 3);
-}
-
-/**
- * @brief Pack a ualberta_sys_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t mode,uint8_t nav_mode,uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_UALBERTA_SYS_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3);
-}
-
-/**
- * @brief Encode a ualberta_sys_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ualberta_sys_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ualberta_sys_status_t* ualberta_sys_status)
-{
-	return mavlink_msg_ualberta_sys_status_pack(system_id, component_id, msg, ualberta_sys_status->mode, ualberta_sys_status->nav_mode, ualberta_sys_status->pilot);
-}
-
-/**
- * @brief Send a ualberta_sys_status message
- * @param chan MAVLink channel to send the message
- *
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ualberta_sys_status_send(mavlink_channel_t chan, uint8_t mode, uint8_t nav_mode, uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_UALBERTA_SYS_STATUS, buf, 3);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_UALBERTA_SYS_STATUS, (const char *)&packet, 3);
-#endif
-}
-
-#endif
-
-// MESSAGE UALBERTA_SYS_STATUS UNPACKING
-
-
-/**
- * @brief Get field mode from ualberta_sys_status message
- *
- * @return System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field nav_mode from ualberta_sys_status message
- *
- * @return Navigation mode, see UALBERTA_NAV_MODE ENUM
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_nav_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field pilot from ualberta_sys_status message
- *
- * @return Pilot mode, see UALBERTA_PILOT_MODE
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_pilot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a ualberta_sys_status message into a struct
- *
- * @param msg The message to decode
- * @param ualberta_sys_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ualberta_sys_status_decode(const mavlink_message_t* msg, mavlink_ualberta_sys_status_t* ualberta_sys_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ualberta_sys_status->mode = mavlink_msg_ualberta_sys_status_get_mode(msg);
-	ualberta_sys_status->nav_mode = mavlink_msg_ualberta_sys_status_get_nav_mode(msg);
-	ualberta_sys_status->pilot = mavlink_msg_ualberta_sys_status_get_pilot(msg);
-#else
-	memcpy(ualberta_sys_status, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v0.9/ualberta/testsuite.h b/mavlink/include/mavlink/v0.9/ualberta/testsuite.h
deleted file mode 100644
index 79a6a004a..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/testsuite.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from ualberta.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef UALBERTA_TESTSUITE_H
-#define UALBERTA_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_ualberta(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_ualberta(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_nav_filter_bias(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_nav_filter_bias_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_nav_filter_bias_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.accel_0 = packet_in.accel_0;
-        	packet1.accel_1 = packet_in.accel_1;
-        	packet1.accel_2 = packet_in.accel_2;
-        	packet1.gyro_0 = packet_in.gyro_0;
-        	packet1.gyro_1 = packet_in.gyro_1;
-        	packet1.gyro_2 = packet_in.gyro_2;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_pack(system_id, component_id, &msg , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_nav_filter_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_send(MAVLINK_COMM_1 , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_radio_calibration(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_radio_calibration_t packet_in = {
-		{ 17235, 17236, 17237 },
-	{ 17547, 17548, 17549 },
-	{ 17859, 17860, 17861 },
-	{ 18171, 18172 },
-	{ 18379, 18380, 18381, 18382, 18383 },
-	{ 18899, 18900, 18901, 18902, 18903 },
-	};
-	mavlink_radio_calibration_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        
-        	mav_array_memcpy(packet1.aileron, packet_in.aileron, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.elevator, packet_in.elevator, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.rudder, packet_in.rudder, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.gyro, packet_in.gyro, sizeof(uint16_t)*2);
-        	mav_array_memcpy(packet1.pitch, packet_in.pitch, sizeof(uint16_t)*5);
-        	mav_array_memcpy(packet1.throttle, packet_in.throttle, sizeof(uint16_t)*5);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_pack(system_id, component_id, &msg , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_radio_calibration_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_send(MAVLINK_COMM_1 , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ualberta_sys_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ualberta_sys_status_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_ualberta_sys_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.mode = packet_in.mode;
-        	packet1.nav_mode = packet_in.nav_mode;
-        	packet1.pilot = packet_in.pilot;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_pack(system_id, component_id, &msg , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ualberta_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_send(MAVLINK_COMM_1 , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ualberta(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_nav_filter_bias(system_id, component_id, last_msg);
-	mavlink_test_radio_calibration(system_id, component_id, last_msg);
-	mavlink_test_ualberta_sys_status(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // UALBERTA_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v0.9/ualberta/ualberta.h b/mavlink/include/mavlink/v0.9/ualberta/ualberta.h
deleted file mode 100644
index 02b448478..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/ualberta.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from ualberta.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef UALBERTA_H
-#define UALBERTA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {3, 4, 8, 14, 8, 28, 3, 32, 0, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 19, 2, 23, 21, 0, 37, 26, 101, 26, 16, 32, 32, 37, 32, 11, 17, 17, 16, 18, 36, 4, 4, 2, 2, 4, 2, 2, 3, 14, 12, 18, 16, 8, 27, 25, 18, 18, 24, 24, 0, 0, 0, 26, 16, 36, 5, 6, 56, 26, 21, 18, 0, 0, 18, 20, 20, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 14, 14, 51, 5}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {72, 39, 190, 92, 191, 217, 104, 119, 0, 219, 60, 186, 10, 0, 0, 0, 0, 0, 0, 0, 89, 159, 162, 121, 0, 149, 222, 110, 179, 136, 66, 126, 185, 147, 112, 252, 162, 215, 229, 128, 9, 106, 101, 213, 4, 229, 21, 214, 215, 14, 206, 50, 157, 126, 108, 213, 95, 5, 127, 0, 0, 0, 57, 126, 130, 119, 193, 191, 236, 158, 143, 0, 0, 104, 123, 131, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 71, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, 224, 60, 106, 7}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_BOOT, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_SYSTEM_TIME_UTC, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACTION_ACK, MAVLINK_MESSAGE_INFO_ACTION, MAVLINK_MESSAGE_INFO_SET_MODE, MAVLINK_MESSAGE_INFO_SET_NAV_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_LOCAL_POSITION, MAVLINK_MESSAGE_INFO_GPS_RAW, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_WAYPOINT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST, MAVLINK_MESSAGE_INFO_WAYPOINT_SET_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_CURRENT, MAVLINK_MESSAGE_INFO_WAYPOINT_REQUEST_LIST, MAVLINK_MESSAGE_INFO_WAYPOINT_COUNT, MAVLINK_MESSAGE_INFO_WAYPOINT_CLEAR_ALL, MAVLINK_MESSAGE_INFO_WAYPOINT_REACHED, MAVLINK_MESSAGE_INFO_WAYPOINT_ACK, MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT_SET, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_CONTROL_STATUS, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_POSITION_TARGET, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, MAVLINK_MESSAGE_INFO_SET_ALTITUDE, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_VFR_HUD, MAVLINK_MESSAGE_INFO_COMMAND, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBJECT_DETECTION_EVENT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_FILTER_BIAS, MAVLINK_MESSAGE_INFO_RADIO_CALIBRATION, MAVLINK_MESSAGE_INFO_UALBERTA_SYS_STATUS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_UALBERTA
-
-#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
-
-
-/** @brief Available autopilot modes for ualberta uav */
-#ifndef HAVE_ENUM_UALBERTA_AUTOPILOT_MODE
-#define HAVE_ENUM_UALBERTA_AUTOPILOT_MODE
-enum UALBERTA_AUTOPILOT_MODE
-{
-	MODE_MANUAL_DIRECT=1, /*  | */
-	MODE_MANUAL_SCALED=2, /*  | */
-	MODE_AUTO_PID_ATT=3, /*  | */
-	MODE_AUTO_PID_VEL=4, /*  | */
-	MODE_AUTO_PID_POS=5, /*  | */
-	UALBERTA_AUTOPILOT_MODE_ENUM_END=6, /*  | */
-};
-#endif
-
-/** @brief Navigation filter mode */
-#ifndef HAVE_ENUM_UALBERTA_NAV_MODE
-#define HAVE_ENUM_UALBERTA_NAV_MODE
-enum UALBERTA_NAV_MODE
-{
-	NAV_AHRS_INIT=1, /*  | */
-	NAV_AHRS=2, /*  | */
-	NAV_INS_GPS_INIT=3, /*  | */
-	NAV_INS_GPS=4, /*  | */
-	UALBERTA_NAV_MODE_ENUM_END=5, /*  | */
-};
-#endif
-
-/** @brief Mode currently commanded by pilot */
-#ifndef HAVE_ENUM_UALBERTA_PILOT_MODE
-#define HAVE_ENUM_UALBERTA_PILOT_MODE
-enum UALBERTA_PILOT_MODE
-{
-	PILOT_MANUAL=1, /*  | */
-	PILOT_AUTO=2, /*  | */
-	PILOT_ROTO=3, /*  | */
-	UALBERTA_PILOT_MODE_ENUM_END=4, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_nav_filter_bias.h"
-#include "./mavlink_msg_radio_calibration.h"
-#include "./mavlink_msg_ualberta_sys_status.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // UALBERTA_H
diff --git a/mavlink/include/mavlink/v0.9/ualberta/version.h b/mavlink/include/mavlink/v0.9/ualberta/version.h
deleted file mode 100644
index f043e537c..000000000
--- a/mavlink/include/mavlink/v0.9/ualberta/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ualberta.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h b/mavlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
index a77a45385..f53bcad9d 100644
--- a/mavlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
@@ -12,34 +12,21 @@ extern "C" {
 // MESSAGE LENGTHS AND CRCS
 
 #ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 8, 4, 12, 15, 13, 6, 15, 14, 0, 12, 3, 8, 28, 36, 3, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
+#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 34, 26, 46, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 8, 4, 12, 15, 13, 6, 15, 14, 0, 12, 3, 8, 28, 44, 3, 9, 22, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 219, 208, 188, 84, 22, 19, 21, 134, 0, 78, 68, 189, 127, 42, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
+#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 240, 183, 130, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 219, 208, 188, 84, 22, 19, 21, 134, 0, 78, 68, 189, 127, 111, 21, 21, 144, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SENSOR_OFFSETS, MAVLINK_MESSAGE_INFO_SET_MAG_OFFSETS, MAVLINK_MESSAGE_INFO_MEMINFO, MAVLINK_MESSAGE_INFO_AP_ADC, MAVLINK_MESSAGE_INFO_DIGICAM_CONFIGURE, MAVLINK_MESSAGE_INFO_DIGICAM_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_CONFIGURE, MAVLINK_MESSAGE_INFO_MOUNT_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_STATUS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_FENCE_POINT, MAVLINK_MESSAGE_INFO_FENCE_FETCH_POINT, MAVLINK_MESSAGE_INFO_FENCE_STATUS, MAVLINK_MESSAGE_INFO_AHRS, MAVLINK_MESSAGE_INFO_SIMSTATE, MAVLINK_MESSAGE_INFO_HWSTATUS, MAVLINK_MESSAGE_INFO_RADIO, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
+#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SENSOR_OFFSETS, MAVLINK_MESSAGE_INFO_SET_MAG_OFFSETS, MAVLINK_MESSAGE_INFO_MEMINFO, MAVLINK_MESSAGE_INFO_AP_ADC, MAVLINK_MESSAGE_INFO_DIGICAM_CONFIGURE, MAVLINK_MESSAGE_INFO_DIGICAM_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_CONFIGURE, MAVLINK_MESSAGE_INFO_MOUNT_CONTROL, MAVLINK_MESSAGE_INFO_MOUNT_STATUS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_FENCE_POINT, MAVLINK_MESSAGE_INFO_FENCE_FETCH_POINT, MAVLINK_MESSAGE_INFO_FENCE_STATUS, MAVLINK_MESSAGE_INFO_AHRS, MAVLINK_MESSAGE_INFO_SIMSTATE, MAVLINK_MESSAGE_INFO_HWSTATUS, MAVLINK_MESSAGE_INFO_RADIO, MAVLINK_MESSAGE_INFO_LIMITS_STATUS, MAVLINK_MESSAGE_INFO_WIND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
 #endif
 
 #include "../protocol.h"
 
 #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,46 @@ enum FENCE_BREACH
 };
 #endif
 
+/** @brief  */
+#ifndef HAVE_ENUM_LIMITS_STATE
+#define HAVE_ENUM_LIMITS_STATE
+enum LIMITS_STATE
+{
+	LIMITS_INIT=0, /*  pre-initialization | */
+	LIMITS_DISABLED=1, /*  disabled | */
+	LIMITS_ENABLED=2, /*  checking limits | */
+	LIMITS_TRIGGERED=3, /*  a limit has been breached | */
+	LIMITS_RECOVERING=4, /*  taking action eg. RTL | */
+	LIMITS_RECOVERED=5, /*  we're no longer in breach of a limit | */
+	LIMITS_STATE_ENUM_END=6, /*  | */
+};
+#endif
+
+/** @brief  */
+#ifndef HAVE_ENUM_LIMIT_MODULE
+#define HAVE_ENUM_LIMIT_MODULE
+enum LIMIT_MODULE
+{
+	LIMIT_GPSLOCK=1, /*  pre-initialization | */
+	LIMIT_GEOFENCE=2, /*  disabled | */
+	LIMIT_ALTITUDE=4, /*  checking limits | */
+	LIMIT_MODULE_ENUM_END=5, /*  | */
+};
+#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"
@@ -144,6 +171,8 @@ enum FENCE_BREACH
 #include "./mavlink_msg_simstate.h"
 #include "./mavlink_msg_hwstatus.h"
 #include "./mavlink_msg_radio.h"
+#include "./mavlink_msg_limits_status.h"
+#include "./mavlink_msg_wind.h"
 
 #ifdef __cplusplus
 }
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h
new file mode 100644
index 000000000..7caac1c5a
--- /dev/null
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h
@@ -0,0 +1,320 @@
+// MESSAGE LIMITS_STATUS PACKING
+
+#define MAVLINK_MSG_ID_LIMITS_STATUS 167
+
+typedef struct __mavlink_limits_status_t
+{
+ uint32_t last_trigger; ///< time of last breach in milliseconds since boot
+ uint32_t last_action; ///< time of last recovery action in milliseconds since boot
+ uint32_t last_recovery; ///< time of last successful recovery in milliseconds since boot
+ uint32_t last_clear; ///< time of last all-clear in milliseconds since boot
+ uint16_t breach_count; ///< number of fence breaches
+ uint8_t limits_state; ///< state of AP_Limits, (see enum LimitState, LIMITS_STATE)
+ uint8_t mods_enabled; ///< AP_Limit_Module bitfield of enabled modules, (see enum moduleid or LIMIT_MODULE)
+ uint8_t mods_required; ///< AP_Limit_Module bitfield of required modules, (see enum moduleid or LIMIT_MODULE)
+ uint8_t mods_triggered; ///< AP_Limit_Module bitfield of triggered modules, (see enum moduleid or LIMIT_MODULE)
+} mavlink_limits_status_t;
+
+#define MAVLINK_MSG_ID_LIMITS_STATUS_LEN 22
+#define MAVLINK_MSG_ID_167_LEN 22
+
+
+
+#define MAVLINK_MESSAGE_INFO_LIMITS_STATUS { \
+	"LIMITS_STATUS", \
+	9, \
+	{  { "last_trigger", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_limits_status_t, last_trigger) }, \
+         { "last_action", NULL, MAVLINK_TYPE_UINT32_T, 0, 4, offsetof(mavlink_limits_status_t, last_action) }, \
+         { "last_recovery", NULL, MAVLINK_TYPE_UINT32_T, 0, 8, offsetof(mavlink_limits_status_t, last_recovery) }, \
+         { "last_clear", NULL, MAVLINK_TYPE_UINT32_T, 0, 12, offsetof(mavlink_limits_status_t, last_clear) }, \
+         { "breach_count", NULL, MAVLINK_TYPE_UINT16_T, 0, 16, offsetof(mavlink_limits_status_t, breach_count) }, \
+         { "limits_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_limits_status_t, limits_state) }, \
+         { "mods_enabled", NULL, MAVLINK_TYPE_UINT8_T, 0, 19, offsetof(mavlink_limits_status_t, mods_enabled) }, \
+         { "mods_required", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_limits_status_t, mods_required) }, \
+         { "mods_triggered", NULL, MAVLINK_TYPE_UINT8_T, 0, 21, offsetof(mavlink_limits_status_t, mods_triggered) }, \
+         } \
+}
+
+
+/**
+ * @brief Pack a limits_status message
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ *
+ * @param limits_state state of AP_Limits, (see enum LimitState, LIMITS_STATE)
+ * @param last_trigger time of last breach in milliseconds since boot
+ * @param last_action time of last recovery action in milliseconds since boot
+ * @param last_recovery time of last successful recovery in milliseconds since boot
+ * @param last_clear time of last all-clear in milliseconds since boot
+ * @param breach_count number of fence breaches
+ * @param mods_enabled AP_Limit_Module bitfield of enabled modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_required AP_Limit_Module bitfield of required modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_triggered AP_Limit_Module bitfield of triggered modules, (see enum moduleid or LIMIT_MODULE)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_limits_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
+						       uint8_t limits_state, uint32_t last_trigger, uint32_t last_action, uint32_t last_recovery, uint32_t last_clear, uint16_t breach_count, uint8_t mods_enabled, uint8_t mods_required, uint8_t mods_triggered)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[22];
+	_mav_put_uint32_t(buf, 0, last_trigger);
+	_mav_put_uint32_t(buf, 4, last_action);
+	_mav_put_uint32_t(buf, 8, last_recovery);
+	_mav_put_uint32_t(buf, 12, last_clear);
+	_mav_put_uint16_t(buf, 16, breach_count);
+	_mav_put_uint8_t(buf, 18, limits_state);
+	_mav_put_uint8_t(buf, 19, mods_enabled);
+	_mav_put_uint8_t(buf, 20, mods_required);
+	_mav_put_uint8_t(buf, 21, mods_triggered);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 22);
+#else
+	mavlink_limits_status_t packet;
+	packet.last_trigger = last_trigger;
+	packet.last_action = last_action;
+	packet.last_recovery = last_recovery;
+	packet.last_clear = last_clear;
+	packet.breach_count = breach_count;
+	packet.limits_state = limits_state;
+	packet.mods_enabled = mods_enabled;
+	packet.mods_required = mods_required;
+	packet.mods_triggered = mods_triggered;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 22);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_LIMITS_STATUS;
+	return mavlink_finalize_message(msg, system_id, component_id, 22, 144);
+}
+
+/**
+ * @brief Pack a limits_status message on a channel
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message was sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param limits_state state of AP_Limits, (see enum LimitState, LIMITS_STATE)
+ * @param last_trigger time of last breach in milliseconds since boot
+ * @param last_action time of last recovery action in milliseconds since boot
+ * @param last_recovery time of last successful recovery in milliseconds since boot
+ * @param last_clear time of last all-clear in milliseconds since boot
+ * @param breach_count number of fence breaches
+ * @param mods_enabled AP_Limit_Module bitfield of enabled modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_required AP_Limit_Module bitfield of required modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_triggered AP_Limit_Module bitfield of triggered modules, (see enum moduleid or LIMIT_MODULE)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_limits_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
+							   mavlink_message_t* msg,
+						           uint8_t limits_state,uint32_t last_trigger,uint32_t last_action,uint32_t last_recovery,uint32_t last_clear,uint16_t breach_count,uint8_t mods_enabled,uint8_t mods_required,uint8_t mods_triggered)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[22];
+	_mav_put_uint32_t(buf, 0, last_trigger);
+	_mav_put_uint32_t(buf, 4, last_action);
+	_mav_put_uint32_t(buf, 8, last_recovery);
+	_mav_put_uint32_t(buf, 12, last_clear);
+	_mav_put_uint16_t(buf, 16, breach_count);
+	_mav_put_uint8_t(buf, 18, limits_state);
+	_mav_put_uint8_t(buf, 19, mods_enabled);
+	_mav_put_uint8_t(buf, 20, mods_required);
+	_mav_put_uint8_t(buf, 21, mods_triggered);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 22);
+#else
+	mavlink_limits_status_t packet;
+	packet.last_trigger = last_trigger;
+	packet.last_action = last_action;
+	packet.last_recovery = last_recovery;
+	packet.last_clear = last_clear;
+	packet.breach_count = breach_count;
+	packet.limits_state = limits_state;
+	packet.mods_enabled = mods_enabled;
+	packet.mods_required = mods_required;
+	packet.mods_triggered = mods_triggered;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 22);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_LIMITS_STATUS;
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 22, 144);
+}
+
+/**
+ * @brief Encode a limits_status struct into a message
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ * @param limits_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_limits_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_limits_status_t* limits_status)
+{
+	return mavlink_msg_limits_status_pack(system_id, component_id, msg, limits_status->limits_state, limits_status->last_trigger, limits_status->last_action, limits_status->last_recovery, limits_status->last_clear, limits_status->breach_count, limits_status->mods_enabled, limits_status->mods_required, limits_status->mods_triggered);
+}
+
+/**
+ * @brief Send a limits_status message
+ * @param chan MAVLink channel to send the message
+ *
+ * @param limits_state state of AP_Limits, (see enum LimitState, LIMITS_STATE)
+ * @param last_trigger time of last breach in milliseconds since boot
+ * @param last_action time of last recovery action in milliseconds since boot
+ * @param last_recovery time of last successful recovery in milliseconds since boot
+ * @param last_clear time of last all-clear in milliseconds since boot
+ * @param breach_count number of fence breaches
+ * @param mods_enabled AP_Limit_Module bitfield of enabled modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_required AP_Limit_Module bitfield of required modules, (see enum moduleid or LIMIT_MODULE)
+ * @param mods_triggered AP_Limit_Module bitfield of triggered modules, (see enum moduleid or LIMIT_MODULE)
+ */
+#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+
+static inline void mavlink_msg_limits_status_send(mavlink_channel_t chan, uint8_t limits_state, uint32_t last_trigger, uint32_t last_action, uint32_t last_recovery, uint32_t last_clear, uint16_t breach_count, uint8_t mods_enabled, uint8_t mods_required, uint8_t mods_triggered)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[22];
+	_mav_put_uint32_t(buf, 0, last_trigger);
+	_mav_put_uint32_t(buf, 4, last_action);
+	_mav_put_uint32_t(buf, 8, last_recovery);
+	_mav_put_uint32_t(buf, 12, last_clear);
+	_mav_put_uint16_t(buf, 16, breach_count);
+	_mav_put_uint8_t(buf, 18, limits_state);
+	_mav_put_uint8_t(buf, 19, mods_enabled);
+	_mav_put_uint8_t(buf, 20, mods_required);
+	_mav_put_uint8_t(buf, 21, mods_triggered);
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LIMITS_STATUS, buf, 22, 144);
+#else
+	mavlink_limits_status_t packet;
+	packet.last_trigger = last_trigger;
+	packet.last_action = last_action;
+	packet.last_recovery = last_recovery;
+	packet.last_clear = last_clear;
+	packet.breach_count = breach_count;
+	packet.limits_state = limits_state;
+	packet.mods_enabled = mods_enabled;
+	packet.mods_required = mods_required;
+	packet.mods_triggered = mods_triggered;
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LIMITS_STATUS, (const char *)&packet, 22, 144);
+#endif
+}
+
+#endif
+
+// MESSAGE LIMITS_STATUS UNPACKING
+
+
+/**
+ * @brief Get field limits_state from limits_status message
+ *
+ * @return state of AP_Limits, (see enum LimitState, LIMITS_STATE)
+ */
+static inline uint8_t mavlink_msg_limits_status_get_limits_state(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  18);
+}
+
+/**
+ * @brief Get field last_trigger from limits_status message
+ *
+ * @return time of last breach in milliseconds since boot
+ */
+static inline uint32_t mavlink_msg_limits_status_get_last_trigger(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint32_t(msg,  0);
+}
+
+/**
+ * @brief Get field last_action from limits_status message
+ *
+ * @return time of last recovery action in milliseconds since boot
+ */
+static inline uint32_t mavlink_msg_limits_status_get_last_action(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint32_t(msg,  4);
+}
+
+/**
+ * @brief Get field last_recovery from limits_status message
+ *
+ * @return time of last successful recovery in milliseconds since boot
+ */
+static inline uint32_t mavlink_msg_limits_status_get_last_recovery(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint32_t(msg,  8);
+}
+
+/**
+ * @brief Get field last_clear from limits_status message
+ *
+ * @return time of last all-clear in milliseconds since boot
+ */
+static inline uint32_t mavlink_msg_limits_status_get_last_clear(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint32_t(msg,  12);
+}
+
+/**
+ * @brief Get field breach_count from limits_status message
+ *
+ * @return number of fence breaches
+ */
+static inline uint16_t mavlink_msg_limits_status_get_breach_count(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint16_t(msg,  16);
+}
+
+/**
+ * @brief Get field mods_enabled from limits_status message
+ *
+ * @return AP_Limit_Module bitfield of enabled modules, (see enum moduleid or LIMIT_MODULE)
+ */
+static inline uint8_t mavlink_msg_limits_status_get_mods_enabled(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  19);
+}
+
+/**
+ * @brief Get field mods_required from limits_status message
+ *
+ * @return AP_Limit_Module bitfield of required modules, (see enum moduleid or LIMIT_MODULE)
+ */
+static inline uint8_t mavlink_msg_limits_status_get_mods_required(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  20);
+}
+
+/**
+ * @brief Get field mods_triggered from limits_status message
+ *
+ * @return AP_Limit_Module bitfield of triggered modules, (see enum moduleid or LIMIT_MODULE)
+ */
+static inline uint8_t mavlink_msg_limits_status_get_mods_triggered(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  21);
+}
+
+/**
+ * @brief Decode a limits_status message into a struct
+ *
+ * @param msg The message to decode
+ * @param limits_status C-struct to decode the message contents into
+ */
+static inline void mavlink_msg_limits_status_decode(const mavlink_message_t* msg, mavlink_limits_status_t* limits_status)
+{
+#if MAVLINK_NEED_BYTE_SWAP
+	limits_status->last_trigger = mavlink_msg_limits_status_get_last_trigger(msg);
+	limits_status->last_action = mavlink_msg_limits_status_get_last_action(msg);
+	limits_status->last_recovery = mavlink_msg_limits_status_get_last_recovery(msg);
+	limits_status->last_clear = mavlink_msg_limits_status_get_last_clear(msg);
+	limits_status->breach_count = mavlink_msg_limits_status_get_breach_count(msg);
+	limits_status->limits_state = mavlink_msg_limits_status_get_limits_state(msg);
+	limits_status->mods_enabled = mavlink_msg_limits_status_get_mods_enabled(msg);
+	limits_status->mods_required = mavlink_msg_limits_status_get_mods_required(msg);
+	limits_status->mods_triggered = mavlink_msg_limits_status_get_mods_triggered(msg);
+#else
+	memcpy(limits_status, _MAV_PAYLOAD(msg), 22);
+#endif
+}
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
index dfcddfc2b..8ee447c77 100644
--- a/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
@@ -13,16 +13,18 @@ typedef struct __mavlink_simstate_t
  float xgyro; ///< Angular speed around X axis rad/s
  float ygyro; ///< Angular speed around Y axis rad/s
  float zgyro; ///< Angular speed around Z axis rad/s
+ float lat; ///< Latitude in degrees
+ float lng; ///< Longitude in degrees
 } mavlink_simstate_t;
 
-#define MAVLINK_MSG_ID_SIMSTATE_LEN 36
-#define MAVLINK_MSG_ID_164_LEN 36
+#define MAVLINK_MSG_ID_SIMSTATE_LEN 44
+#define MAVLINK_MSG_ID_164_LEN 44
 
 
 
 #define MAVLINK_MESSAGE_INFO_SIMSTATE { \
 	"SIMSTATE", \
-	9, \
+	11, \
 	{  { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_simstate_t, roll) }, \
          { "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_simstate_t, pitch) }, \
          { "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_simstate_t, yaw) }, \
@@ -32,6 +34,8 @@ typedef struct __mavlink_simstate_t
          { "xgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_simstate_t, xgyro) }, \
          { "ygyro", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_simstate_t, ygyro) }, \
          { "zgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_simstate_t, zgyro) }, \
+         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_simstate_t, lat) }, \
+         { "lng", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_simstate_t, lng) }, \
          } \
 }
 
@@ -51,13 +55,15 @@ typedef struct __mavlink_simstate_t
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
+ * @param lat Latitude in degrees
+ * @param lng Longitude in degrees
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro)
+						       float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, float lat, float lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
+	char buf[44];
 	_mav_put_float(buf, 0, roll);
 	_mav_put_float(buf, 4, pitch);
 	_mav_put_float(buf, 8, yaw);
@@ -67,8 +73,10 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
+	_mav_put_float(buf, 36, lat);
+	_mav_put_float(buf, 40, lng);
 
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 44);
 #else
 	mavlink_simstate_t packet;
 	packet.roll = roll;
@@ -80,12 +88,14 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
 	packet.xgyro = xgyro;
 	packet.ygyro = ygyro;
 	packet.zgyro = zgyro;
+	packet.lat = lat;
+	packet.lng = lng;
 
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 44);
 #endif
 
 	msg->msgid = MAVLINK_MSG_ID_SIMSTATE;
-	return mavlink_finalize_message(msg, system_id, component_id, 36, 42);
+	return mavlink_finalize_message(msg, system_id, component_id, 44, 111);
 }
 
 /**
@@ -103,14 +113,16 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
+ * @param lat Latitude in degrees
+ * @param lng Longitude in degrees
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
 							   mavlink_message_t* msg,
-						           float roll,float pitch,float yaw,float xacc,float yacc,float zacc,float xgyro,float ygyro,float zgyro)
+						           float roll,float pitch,float yaw,float xacc,float yacc,float zacc,float xgyro,float ygyro,float zgyro,float lat,float lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
+	char buf[44];
 	_mav_put_float(buf, 0, roll);
 	_mav_put_float(buf, 4, pitch);
 	_mav_put_float(buf, 8, yaw);
@@ -120,8 +132,10 @@ static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
+	_mav_put_float(buf, 36, lat);
+	_mav_put_float(buf, 40, lng);
 
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 36);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 44);
 #else
 	mavlink_simstate_t packet;
 	packet.roll = roll;
@@ -133,12 +147,14 @@ static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t
 	packet.xgyro = xgyro;
 	packet.ygyro = ygyro;
 	packet.zgyro = zgyro;
+	packet.lat = lat;
+	packet.lng = lng;
 
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 36);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 44);
 #endif
 
 	msg->msgid = MAVLINK_MSG_ID_SIMSTATE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 36, 42);
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 44, 111);
 }
 
 /**
@@ -151,7 +167,7 @@ static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t
  */
 static inline uint16_t mavlink_msg_simstate_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_simstate_t* simstate)
 {
-	return mavlink_msg_simstate_pack(system_id, component_id, msg, simstate->roll, simstate->pitch, simstate->yaw, simstate->xacc, simstate->yacc, simstate->zacc, simstate->xgyro, simstate->ygyro, simstate->zgyro);
+	return mavlink_msg_simstate_pack(system_id, component_id, msg, simstate->roll, simstate->pitch, simstate->yaw, simstate->xacc, simstate->yacc, simstate->zacc, simstate->xgyro, simstate->ygyro, simstate->zgyro, simstate->lat, simstate->lng);
 }
 
 /**
@@ -167,13 +183,15 @@ static inline uint16_t mavlink_msg_simstate_encode(uint8_t system_id, uint8_t co
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
+ * @param lat Latitude in degrees
+ * @param lng Longitude in degrees
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro)
+static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, float lat, float lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[36];
+	char buf[44];
 	_mav_put_float(buf, 0, roll);
 	_mav_put_float(buf, 4, pitch);
 	_mav_put_float(buf, 8, yaw);
@@ -183,8 +201,10 @@ static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll,
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
+	_mav_put_float(buf, 36, lat);
+	_mav_put_float(buf, 40, lng);
 
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, buf, 36, 42);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, buf, 44, 111);
 #else
 	mavlink_simstate_t packet;
 	packet.roll = roll;
@@ -196,8 +216,10 @@ static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll,
 	packet.xgyro = xgyro;
 	packet.ygyro = ygyro;
 	packet.zgyro = zgyro;
+	packet.lat = lat;
+	packet.lng = lng;
 
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, (const char *)&packet, 36, 42);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, (const char *)&packet, 44, 111);
 #endif
 }
 
@@ -297,6 +319,26 @@ static inline float mavlink_msg_simstate_get_zgyro(const mavlink_message_t* msg)
 }
 
 /**
+ * @brief Get field lat from simstate message
+ *
+ * @return Latitude in degrees
+ */
+static inline float mavlink_msg_simstate_get_lat(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  36);
+}
+
+/**
+ * @brief Get field lng from simstate message
+ *
+ * @return Longitude in degrees
+ */
+static inline float mavlink_msg_simstate_get_lng(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  40);
+}
+
+/**
  * @brief Decode a simstate message into a struct
  *
  * @param msg The message to decode
@@ -314,7 +356,9 @@ static inline void mavlink_msg_simstate_decode(const mavlink_message_t* msg, mav
 	simstate->xgyro = mavlink_msg_simstate_get_xgyro(msg);
 	simstate->ygyro = mavlink_msg_simstate_get_ygyro(msg);
 	simstate->zgyro = mavlink_msg_simstate_get_zgyro(msg);
+	simstate->lat = mavlink_msg_simstate_get_lat(msg);
+	simstate->lng = mavlink_msg_simstate_get_lng(msg);
 #else
-	memcpy(simstate, _MAV_PAYLOAD(msg), 36);
+	memcpy(simstate, _MAV_PAYLOAD(msg), 44);
 #endif
 }
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_wind.h b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_wind.h
new file mode 100644
index 000000000..e0810a9d3
--- /dev/null
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_wind.h
@@ -0,0 +1,188 @@
+// MESSAGE WIND PACKING
+
+#define MAVLINK_MSG_ID_WIND 168
+
+typedef struct __mavlink_wind_t
+{
+ float direction; ///< wind direction (degrees)
+ float speed; ///< wind speed in ground plane (m/s)
+ float speed_z; ///< vertical wind speed (m/s)
+} mavlink_wind_t;
+
+#define MAVLINK_MSG_ID_WIND_LEN 12
+#define MAVLINK_MSG_ID_168_LEN 12
+
+
+
+#define MAVLINK_MESSAGE_INFO_WIND { \
+	"WIND", \
+	3, \
+	{  { "direction", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_wind_t, direction) }, \
+         { "speed", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_wind_t, speed) }, \
+         { "speed_z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_wind_t, speed_z) }, \
+         } \
+}
+
+
+/**
+ * @brief Pack a wind message
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ *
+ * @param direction wind direction (degrees)
+ * @param speed wind speed in ground plane (m/s)
+ * @param speed_z vertical wind speed (m/s)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_wind_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
+						       float direction, float speed, float speed_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[12];
+	_mav_put_float(buf, 0, direction);
+	_mav_put_float(buf, 4, speed);
+	_mav_put_float(buf, 8, speed_z);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
+#else
+	mavlink_wind_t packet;
+	packet.direction = direction;
+	packet.speed = speed;
+	packet.speed_z = speed_z;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_WIND;
+	return mavlink_finalize_message(msg, system_id, component_id, 12, 1);
+}
+
+/**
+ * @brief Pack a wind message on a channel
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message was sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param direction wind direction (degrees)
+ * @param speed wind speed in ground plane (m/s)
+ * @param speed_z vertical wind speed (m/s)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_wind_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
+							   mavlink_message_t* msg,
+						           float direction,float speed,float speed_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[12];
+	_mav_put_float(buf, 0, direction);
+	_mav_put_float(buf, 4, speed);
+	_mav_put_float(buf, 8, speed_z);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
+#else
+	mavlink_wind_t packet;
+	packet.direction = direction;
+	packet.speed = speed;
+	packet.speed_z = speed_z;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_WIND;
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12, 1);
+}
+
+/**
+ * @brief Encode a wind struct into a message
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ * @param wind C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_wind_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_wind_t* wind)
+{
+	return mavlink_msg_wind_pack(system_id, component_id, msg, wind->direction, wind->speed, wind->speed_z);
+}
+
+/**
+ * @brief Send a wind message
+ * @param chan MAVLink channel to send the message
+ *
+ * @param direction wind direction (degrees)
+ * @param speed wind speed in ground plane (m/s)
+ * @param speed_z vertical wind speed (m/s)
+ */
+#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+
+static inline void mavlink_msg_wind_send(mavlink_channel_t chan, float direction, float speed, float speed_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[12];
+	_mav_put_float(buf, 0, direction);
+	_mav_put_float(buf, 4, speed);
+	_mav_put_float(buf, 8, speed_z);
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WIND, buf, 12, 1);
+#else
+	mavlink_wind_t packet;
+	packet.direction = direction;
+	packet.speed = speed;
+	packet.speed_z = speed_z;
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WIND, (const char *)&packet, 12, 1);
+#endif
+}
+
+#endif
+
+// MESSAGE WIND UNPACKING
+
+
+/**
+ * @brief Get field direction from wind message
+ *
+ * @return wind direction (degrees)
+ */
+static inline float mavlink_msg_wind_get_direction(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  0);
+}
+
+/**
+ * @brief Get field speed from wind message
+ *
+ * @return wind speed in ground plane (m/s)
+ */
+static inline float mavlink_msg_wind_get_speed(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  4);
+}
+
+/**
+ * @brief Get field speed_z from wind message
+ *
+ * @return vertical wind speed (m/s)
+ */
+static inline float mavlink_msg_wind_get_speed_z(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  8);
+}
+
+/**
+ * @brief Decode a wind message into a struct
+ *
+ * @param msg The message to decode
+ * @param wind C-struct to decode the message contents into
+ */
+static inline void mavlink_msg_wind_decode(const mavlink_message_t* msg, mavlink_wind_t* wind)
+{
+#if MAVLINK_NEED_BYTE_SWAP
+	wind->direction = mavlink_msg_wind_get_direction(msg);
+	wind->speed = mavlink_msg_wind_get_speed(msg);
+	wind->speed_z = mavlink_msg_wind_get_speed_z(msg);
+#else
+	memcpy(wind, _MAV_PAYLOAD(msg), 12);
+#endif
+}
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/testsuite.h b/mavlink/include/mavlink/v1.0/ardupilotmega/testsuite.h
index aa83889d6..7b7cf43db 100644
--- a/mavlink/include/mavlink/v1.0/ardupilotmega/testsuite.h
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/testsuite.h
@@ -738,6 +738,8 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
 	185.0,
 	213.0,
 	241.0,
+	269.0,
+	297.0,
 	};
 	mavlink_simstate_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
@@ -750,6 +752,8 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
         	packet1.xgyro = packet_in.xgyro;
         	packet1.ygyro = packet_in.ygyro;
         	packet1.zgyro = packet_in.zgyro;
+        	packet1.lat = packet_in.lat;
+        	packet1.lng = packet_in.lng;
         
         
 
@@ -759,12 +763,12 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_pack(system_id, component_id, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
+	mavlink_msg_simstate_pack(system_id, component_id, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.lat , packet1.lng );
 	mavlink_msg_simstate_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
+	mavlink_msg_simstate_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.lat , packet1.lng );
 	mavlink_msg_simstate_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -777,7 +781,7 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_simstate_send(MAVLINK_COMM_1 , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro );
+	mavlink_msg_simstate_send(MAVLINK_COMM_1 , packet1.roll , packet1.pitch , packet1.yaw , packet1.xacc , packet1.yacc , packet1.zacc , packet1.xgyro , packet1.ygyro , packet1.zgyro , packet1.lat , packet1.lng );
 	mavlink_msg_simstate_decode(last_msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
@@ -882,6 +886,112 @@ static void mavlink_test_radio(uint8_t system_id, uint8_t component_id, mavlink_
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
 
+static void mavlink_test_limits_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
+{
+	mavlink_message_t msg;
+        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
+        uint16_t i;
+	mavlink_limits_status_t packet_in = {
+		963497464,
+	963497672,
+	963497880,
+	963498088,
+	18067,
+	187,
+	254,
+	65,
+	132,
+	};
+	mavlink_limits_status_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.last_trigger = packet_in.last_trigger;
+        	packet1.last_action = packet_in.last_action;
+        	packet1.last_recovery = packet_in.last_recovery;
+        	packet1.last_clear = packet_in.last_clear;
+        	packet1.breach_count = packet_in.breach_count;
+        	packet1.limits_state = packet_in.limits_state;
+        	packet1.mods_enabled = packet_in.mods_enabled;
+        	packet1.mods_required = packet_in.mods_required;
+        	packet1.mods_triggered = packet_in.mods_triggered;
+        
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_limits_status_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_limits_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_limits_status_pack(system_id, component_id, &msg , packet1.limits_state , packet1.last_trigger , packet1.last_action , packet1.last_recovery , packet1.last_clear , packet1.breach_count , packet1.mods_enabled , packet1.mods_required , packet1.mods_triggered );
+	mavlink_msg_limits_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_limits_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.limits_state , packet1.last_trigger , packet1.last_action , packet1.last_recovery , packet1.last_clear , packet1.breach_count , packet1.mods_enabled , packet1.mods_required , packet1.mods_triggered );
+	mavlink_msg_limits_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+        mavlink_msg_to_send_buffer(buffer, &msg);
+        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
+        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
+        }
+	mavlink_msg_limits_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_limits_status_send(MAVLINK_COMM_1 , packet1.limits_state , packet1.last_trigger , packet1.last_action , packet1.last_recovery , packet1.last_clear , packet1.breach_count , packet1.mods_enabled , packet1.mods_required , packet1.mods_triggered );
+	mavlink_msg_limits_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
+static void mavlink_test_wind(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
+{
+	mavlink_message_t msg;
+        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
+        uint16_t i;
+	mavlink_wind_t packet_in = {
+		17.0,
+	45.0,
+	73.0,
+	};
+	mavlink_wind_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.direction = packet_in.direction;
+        	packet1.speed = packet_in.speed;
+        	packet1.speed_z = packet_in.speed_z;
+        
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_wind_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_wind_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_wind_pack(system_id, component_id, &msg , packet1.direction , packet1.speed , packet1.speed_z );
+	mavlink_msg_wind_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_wind_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.direction , packet1.speed , packet1.speed_z );
+	mavlink_msg_wind_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+        mavlink_msg_to_send_buffer(buffer, &msg);
+        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
+        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
+        }
+	mavlink_msg_wind_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_wind_send(MAVLINK_COMM_1 , packet1.direction , packet1.speed , packet1.speed_z );
+	mavlink_msg_wind_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
 static void mavlink_test_ardupilotmega(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
 {
 	mavlink_test_sensor_offsets(system_id, component_id, last_msg);
@@ -900,6 +1010,8 @@ static void mavlink_test_ardupilotmega(uint8_t system_id, uint8_t component_id,
 	mavlink_test_simstate(system_id, component_id, last_msg);
 	mavlink_test_hwstatus(system_id, component_id, last_msg);
 	mavlink_test_radio(system_id, component_id, last_msg);
+	mavlink_test_limits_status(system_id, component_id, last_msg);
+	mavlink_test_wind(system_id, component_id, last_msg);
 }
 
 #ifdef __cplusplus
diff --git a/mavlink/include/mavlink/v1.0/ardupilotmega/version.h b/mavlink/include/mavlink/v1.0/ardupilotmega/version.h
index 7cc3ee13d..d88d8965c 100644
--- a/mavlink/include/mavlink/v1.0/ardupilotmega/version.h
+++ b/mavlink/include/mavlink/v1.0/ardupilotmega/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:47 2012"
+#define MAVLINK_BUILD_DATE "Thu Aug 23 16:39:14 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/mavlink/include/mavlink/v1.0/common/common.h b/mavlink/include/mavlink/v1.0/common/common.h
index 7c017f39f..b7004f307 100644
--- a/mavlink/include/mavlink/v1.0/common/common.h
+++ b/mavlink/include/mavlink/v1.0/common/common.h
@@ -12,34 +12,21 @@ extern "C" {
 // MESSAGE LENGTHS AND CRCS
 
 #ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
+#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 34, 26, 46, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
+#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 240, 183, 130, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
+#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
 #endif
 
 #include "../protocol.h"
 
 #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
 
 
@@ -60,7 +47,8 @@ enum MAV_AUTOPILOT
 	MAV_AUTOPILOT_PPZ=9, /* PPZ UAV - http://nongnu.org/paparazzi | */
 	MAV_AUTOPILOT_UDB=10, /* UAV Dev Board | */
 	MAV_AUTOPILOT_FP=11, /* FlexiPilot | */
-	MAV_AUTOPILOT_ENUM_END=12, /*  | */
+	MAV_AUTOPILOT_PX4=12, /* PX4 Autopilot - http://pixhawk.ethz.ch/px4/ | */
+	MAV_AUTOPILOT_ENUM_END=13, /*  | */
 };
 #endif
 
@@ -336,19 +324,22 @@ enum MAV_CMD_ACK
 };
 #endif
 
-/** @brief type of a mavlink parameter */
-#ifndef HAVE_ENUM_MAV_VAR
-#define HAVE_ENUM_MAV_VAR
-enum MAV_VAR
+/** @brief Specifies the datatype of a MAVLink parameter. */
+#ifndef HAVE_ENUM_MAV_PARAM_TYPE
+#define HAVE_ENUM_MAV_PARAM_TYPE
+enum MAV_PARAM_TYPE
 {
-	MAV_VAR_FLOAT=0, /* 32 bit float | */
-	MAV_VAR_UINT8=1, /* 8 bit unsigned integer | */
-	MAV_VAR_INT8=2, /* 8 bit signed integer | */
-	MAV_VAR_UINT16=3, /* 16 bit unsigned integer | */
-	MAV_VAR_INT16=4, /* 16 bit signed integer | */
-	MAV_VAR_UINT32=5, /* 32 bit unsigned integer | */
-	MAV_VAR_INT32=6, /* 32 bit signed integer | */
-	MAV_VAR_ENUM_END=7, /*  | */
+	MAV_PARAM_TYPE_UINT8=1, /* 8-bit unsigned integer | */
+	MAV_PARAM_TYPE_INT8=2, /* 8-bit signed integer | */
+	MAV_PARAM_TYPE_UINT16=3, /* 16-bit unsigned integer | */
+	MAV_PARAM_TYPE_INT16=4, /* 16-bit signed integer | */
+	MAV_PARAM_TYPE_UINT32=5, /* 32-bit unsigned integer | */
+	MAV_PARAM_TYPE_INT32=6, /* 32-bit signed integer | */
+	MAV_PARAM_TYPE_UINT64=7, /* 64-bit unsigned integer | */
+	MAV_PARAM_TYPE_INT64=8, /* 64-bit signed integer | */
+	MAV_PARAM_TYPE_REAL32=9, /* 32-bit floating-point | */
+	MAV_PARAM_TYPE_REAL64=10, /* 64-bit floating-point | */
+	MAV_PARAM_TYPE_ENUM_END=11, /*  | */
 };
 #endif
 
@@ -407,6 +398,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"
@@ -459,6 +463,7 @@ enum MAV_SEVERITY
 #include "./mavlink_msg_set_quad_motors_setpoint.h"
 #include "./mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h"
 #include "./mavlink_msg_nav_controller_output.h"
+#include "./mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust.h"
 #include "./mavlink_msg_state_correction.h"
 #include "./mavlink_msg_request_data_stream.h"
 #include "./mavlink_msg_data_stream.h"
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_request_read.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_request_read.h
index 61d00f62d..dba528df9 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_request_read.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_request_read.h
@@ -4,10 +4,10 @@
 
 typedef struct __mavlink_param_request_read_t
 {
- int16_t param_index; ///< Parameter index. Send -1 to use the param ID field as identifier
+ int16_t param_index; ///< Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored)
  uint8_t target_system; ///< System ID
  uint8_t target_component; ///< Component ID
- char param_id[16]; ///< Onboard parameter id
+ char param_id[16]; ///< Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
 } mavlink_param_request_read_t;
 
 #define MAVLINK_MSG_ID_PARAM_REQUEST_READ_LEN 20
@@ -34,8 +34,8 @@ typedef struct __mavlink_param_request_read_t
  *
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
+ * @param param_index Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored)
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_param_request_read_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
@@ -69,8 +69,8 @@ static inline uint16_t mavlink_msg_param_request_read_pack(uint8_t system_id, ui
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
+ * @param param_index Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored)
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_param_request_read_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
@@ -116,8 +116,8 @@ static inline uint16_t mavlink_msg_param_request_read_encode(uint8_t system_id,
  *
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
- * @param param_index Parameter index. Send -1 to use the param ID field as identifier
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
+ * @param param_index Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored)
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
@@ -168,7 +168,7 @@ static inline uint8_t mavlink_msg_param_request_read_get_target_component(const
 /**
  * @brief Get field param_id from param_request_read message
  *
- * @return Onboard parameter id
+ * @return Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  */
 static inline uint16_t mavlink_msg_param_request_read_get_param_id(const mavlink_message_t* msg, char *param_id)
 {
@@ -178,7 +178,7 @@ static inline uint16_t mavlink_msg_param_request_read_get_param_id(const mavlink
 /**
  * @brief Get field param_index from param_request_read message
  *
- * @return Parameter index. Send -1 to use the param ID field as identifier
+ * @return Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored)
  */
 static inline int16_t mavlink_msg_param_request_read_get_param_index(const mavlink_message_t* msg)
 {
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_set.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_set.h
index a7e895f18..8f00f22e9 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_set.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_set.h
@@ -7,8 +7,8 @@ typedef struct __mavlink_param_set_t
  float param_value; ///< Onboard parameter value
  uint8_t target_system; ///< System ID
  uint8_t target_component; ///< Component ID
- char param_id[16]; ///< Onboard parameter id
- uint8_t param_type; ///< Onboard parameter type: see MAV_VAR enum
+ char param_id[16]; ///< Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
+ uint8_t param_type; ///< Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
 } mavlink_param_set_t;
 
 #define MAVLINK_MSG_ID_PARAM_SET_LEN 23
@@ -36,9 +36,9 @@ typedef struct __mavlink_param_set_t
  *
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_param_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
@@ -74,9 +74,9 @@ static inline uint16_t mavlink_msg_param_set_pack(uint8_t system_id, uint8_t com
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_param_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
@@ -124,9 +124,9 @@ static inline uint16_t mavlink_msg_param_set_encode(uint8_t system_id, uint8_t c
  *
  * @param target_system System ID
  * @param target_component Component ID
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
@@ -179,7 +179,7 @@ static inline uint8_t mavlink_msg_param_set_get_target_component(const mavlink_m
 /**
  * @brief Get field param_id from param_set message
  *
- * @return Onboard parameter id
+ * @return Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  */
 static inline uint16_t mavlink_msg_param_set_get_param_id(const mavlink_message_t* msg, char *param_id)
 {
@@ -199,7 +199,7 @@ static inline float mavlink_msg_param_set_get_param_value(const mavlink_message_
 /**
  * @brief Get field param_type from param_set message
  *
- * @return Onboard parameter type: see MAV_VAR enum
+ * @return Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  */
 static inline uint8_t mavlink_msg_param_set_get_param_type(const mavlink_message_t* msg)
 {
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_value.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_value.h
index 4e16a5631..03a631984 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_value.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_param_value.h
@@ -7,8 +7,8 @@ typedef struct __mavlink_param_value_t
  float param_value; ///< Onboard parameter value
  uint16_t param_count; ///< Total number of onboard parameters
  uint16_t param_index; ///< Index of this onboard parameter
- char param_id[16]; ///< Onboard parameter id
- uint8_t param_type; ///< Onboard parameter type: see MAV_VAR enum
+ char param_id[16]; ///< Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
+ uint8_t param_type; ///< Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
 } mavlink_param_value_t;
 
 #define MAVLINK_MSG_ID_PARAM_VALUE_LEN 25
@@ -34,9 +34,9 @@ typedef struct __mavlink_param_value_t
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param msg The MAVLink message to compress the data into
  *
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  * @param param_count Total number of onboard parameters
  * @param param_index Index of this onboard parameter
  * @return length of the message in bytes (excluding serial stream start sign)
@@ -72,9 +72,9 @@ static inline uint16_t mavlink_msg_param_value_pack(uint8_t system_id, uint8_t c
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param chan The MAVLink channel this message was sent over
  * @param msg The MAVLink message to compress the data into
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  * @param param_count Total number of onboard parameters
  * @param param_index Index of this onboard parameter
  * @return length of the message in bytes (excluding serial stream start sign)
@@ -122,9 +122,9 @@ static inline uint16_t mavlink_msg_param_value_encode(uint8_t system_id, uint8_t
  * @brief Send a param_value message
  * @param chan MAVLink channel to send the message
  *
- * @param param_id Onboard parameter id
+ * @param param_id Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  * @param param_value Onboard parameter value
- * @param param_type Onboard parameter type: see MAV_VAR enum
+ * @param param_type Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  * @param param_count Total number of onboard parameters
  * @param param_index Index of this onboard parameter
  */
@@ -159,7 +159,7 @@ static inline void mavlink_msg_param_value_send(mavlink_channel_t chan, const ch
 /**
  * @brief Get field param_id from param_value message
  *
- * @return Onboard parameter id
+ * @return Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string
  */
 static inline uint16_t mavlink_msg_param_value_get_param_id(const mavlink_message_t* msg, char *param_id)
 {
@@ -179,7 +179,7 @@ static inline float mavlink_msg_param_value_get_param_value(const mavlink_messag
 /**
  * @brief Get field param_type from param_value message
  *
- * @return Onboard parameter type: see MAV_VAR enum
+ * @return Onboard parameter type: see the MAV_PARAM_TYPE enum for supported data types.
  */
 static inline uint8_t mavlink_msg_param_value_get_param_type(const mavlink_message_t* msg)
 {
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
index dac1e0b9a..d9ddcd47f 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
@@ -4,7 +4,7 @@
 
 typedef struct __mavlink_scaled_pressure_t
 {
- uint32_t time_boot_ms; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
+ uint32_t time_boot_ms; ///< Timestamp (milliseconds since system boot)
  float press_abs; ///< Absolute pressure (hectopascal)
  float press_diff; ///< Differential pressure 1 (hectopascal)
  int16_t temperature; ///< Temperature measurement (0.01 degrees celsius)
@@ -32,7 +32,7 @@ typedef struct __mavlink_scaled_pressure_t
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param msg The MAVLink message to compress the data into
  *
- * @param time_boot_ms Timestamp (microseconds since UNIX epoch or microseconds since system boot)
+ * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param press_abs Absolute pressure (hectopascal)
  * @param press_diff Differential pressure 1 (hectopascal)
  * @param temperature Temperature measurement (0.01 degrees celsius)
@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_scaled_pressure_pack(uint8_t system_id, uint8
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param chan The MAVLink channel this message was sent over
  * @param msg The MAVLink message to compress the data into
- * @param time_boot_ms Timestamp (microseconds since UNIX epoch or microseconds since system boot)
+ * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param press_abs Absolute pressure (hectopascal)
  * @param press_diff Differential pressure 1 (hectopascal)
  * @param temperature Temperature measurement (0.01 degrees celsius)
@@ -118,7 +118,7 @@ static inline uint16_t mavlink_msg_scaled_pressure_encode(uint8_t system_id, uin
  * @brief Send a scaled_pressure message
  * @param chan MAVLink channel to send the message
  *
- * @param time_boot_ms Timestamp (microseconds since UNIX epoch or microseconds since system boot)
+ * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param press_abs Absolute pressure (hectopascal)
  * @param press_diff Differential pressure 1 (hectopascal)
  * @param temperature Temperature measurement (0.01 degrees celsius)
@@ -154,7 +154,7 @@ static inline void mavlink_msg_scaled_pressure_send(mavlink_channel_t chan, uint
 /**
  * @brief Get field time_boot_ms from scaled_pressure message
  *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
+ * @return Timestamp (milliseconds since system boot)
  */
 static inline uint32_t mavlink_msg_scaled_pressure_get_time_boot_ms(const mavlink_message_t* msg)
 {
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
index 34a58cd76..45c94d8b9 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
@@ -4,7 +4,7 @@
 
 typedef struct __mavlink_servo_output_raw_t
 {
- uint32_t time_usec; ///< Timestamp (since UNIX epoch or microseconds since system boot)
+ uint32_t time_usec; ///< Timestamp (microseconds since system boot)
  uint16_t servo1_raw; ///< Servo output 1 value, in microseconds
  uint16_t servo2_raw; ///< Servo output 2 value, in microseconds
  uint16_t servo3_raw; ///< Servo output 3 value, in microseconds
@@ -44,7 +44,7 @@ typedef struct __mavlink_servo_output_raw_t
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param msg The MAVLink message to compress the data into
  *
- * @param time_usec Timestamp (since UNIX epoch or microseconds since system boot)
+ * @param time_usec Timestamp (microseconds since system boot)
  * @param port Servo output port (set of 8 outputs = 1 port). Most MAVs will just use one, but this allows to encode more than 8 servos.
  * @param servo1_raw Servo output 1 value, in microseconds
  * @param servo2_raw Servo output 2 value, in microseconds
@@ -99,7 +99,7 @@ static inline uint16_t mavlink_msg_servo_output_raw_pack(uint8_t system_id, uint
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param chan The MAVLink channel this message was sent over
  * @param msg The MAVLink message to compress the data into
- * @param time_usec Timestamp (since UNIX epoch or microseconds since system boot)
+ * @param time_usec Timestamp (microseconds since system boot)
  * @param port Servo output port (set of 8 outputs = 1 port). Most MAVs will just use one, but this allows to encode more than 8 servos.
  * @param servo1_raw Servo output 1 value, in microseconds
  * @param servo2_raw Servo output 2 value, in microseconds
@@ -166,7 +166,7 @@ static inline uint16_t mavlink_msg_servo_output_raw_encode(uint8_t system_id, ui
  * @brief Send a servo_output_raw message
  * @param chan MAVLink channel to send the message
  *
- * @param time_usec Timestamp (since UNIX epoch or microseconds since system boot)
+ * @param time_usec Timestamp (microseconds since system boot)
  * @param port Servo output port (set of 8 outputs = 1 port). Most MAVs will just use one, but this allows to encode more than 8 servos.
  * @param servo1_raw Servo output 1 value, in microseconds
  * @param servo2_raw Servo output 2 value, in microseconds
@@ -220,7 +220,7 @@ static inline void mavlink_msg_servo_output_raw_send(mavlink_channel_t chan, uin
 /**
  * @brief Get field time_usec from servo_output_raw message
  *
- * @return Timestamp (since UNIX epoch or microseconds since system boot)
+ * @return Timestamp (microseconds since system boot)
  */
 static inline uint32_t mavlink_msg_servo_output_raw_get_time_usec(const mavlink_message_t* msg)
 {
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust.h
new file mode 100644
index 000000000..75a1420a1
--- /dev/null
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust.h
@@ -0,0 +1,320 @@
+// MESSAGE SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST PACKING
+
+#define MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST 63
+
+typedef struct __mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t
+{
+ int16_t roll[4]; ///< Desired roll angle in radians +-PI (+-32767)
+ int16_t pitch[4]; ///< Desired pitch angle in radians +-PI (+-32767)
+ int16_t yaw[4]; ///< Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ uint16_t thrust[4]; ///< Collective thrust, scaled to uint16 (0..65535)
+ uint8_t group; ///< ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ uint8_t mode; ///< ID of the flight mode (0 - 255, up to 256 modes supported)
+ uint8_t led_red[4]; ///< RGB red channel (0-255)
+ uint8_t led_blue[4]; ///< RGB green channel (0-255)
+ uint8_t led_green[4]; ///< RGB blue channel (0-255)
+} mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t;
+
+#define MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_LEN 46
+#define MAVLINK_MSG_ID_63_LEN 46
+
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_ROLL_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_PITCH_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_YAW_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_THRUST_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_LED_RED_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_LED_BLUE_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST_FIELD_LED_GREEN_LEN 4
+
+#define MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST { \
+	"SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST", \
+	9, \
+	{  { "roll", NULL, MAVLINK_TYPE_INT16_T, 4, 0, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, roll) }, \
+         { "pitch", NULL, MAVLINK_TYPE_INT16_T, 4, 8, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, pitch) }, \
+         { "yaw", NULL, MAVLINK_TYPE_INT16_T, 4, 16, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, yaw) }, \
+         { "thrust", NULL, MAVLINK_TYPE_UINT16_T, 4, 24, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, thrust) }, \
+         { "group", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, group) }, \
+         { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 33, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, mode) }, \
+         { "led_red", NULL, MAVLINK_TYPE_UINT8_T, 4, 34, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, led_red) }, \
+         { "led_blue", NULL, MAVLINK_TYPE_UINT8_T, 4, 38, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, led_blue) }, \
+         { "led_green", NULL, MAVLINK_TYPE_UINT8_T, 4, 42, offsetof(mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t, led_green) }, \
+         } \
+}
+
+
+/**
+ * @brief Pack a set_quad_swarm_led_roll_pitch_yaw_thrust message
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ *
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param led_red RGB red channel (0-255)
+ * @param led_blue RGB green channel (0-255)
+ * @param led_green RGB blue channel (0-255)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
+						       uint8_t group, uint8_t mode, const uint8_t *led_red, const uint8_t *led_blue, const uint8_t *led_green, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[46];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+	_mav_put_uint8_t_array(buf, 34, led_red, 4);
+	_mav_put_uint8_t_array(buf, 38, led_blue, 4);
+	_mav_put_uint8_t_array(buf, 42, led_green, 4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 46);
+#else
+	mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t packet;
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+	mav_array_memcpy(packet.led_red, led_red, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_blue, led_blue, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_green, led_green, sizeof(uint8_t)*4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 46);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST;
+	return mavlink_finalize_message(msg, system_id, component_id, 46, 130);
+}
+
+/**
+ * @brief Pack a set_quad_swarm_led_roll_pitch_yaw_thrust message on a channel
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message was sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param led_red RGB red channel (0-255)
+ * @param led_blue RGB green channel (0-255)
+ * @param led_green RGB blue channel (0-255)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
+							   mavlink_message_t* msg,
+						           uint8_t group,uint8_t mode,const uint8_t *led_red,const uint8_t *led_blue,const uint8_t *led_green,const int16_t *roll,const int16_t *pitch,const int16_t *yaw,const uint16_t *thrust)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[46];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+	_mav_put_uint8_t_array(buf, 34, led_red, 4);
+	_mav_put_uint8_t_array(buf, 38, led_blue, 4);
+	_mav_put_uint8_t_array(buf, 42, led_green, 4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 46);
+#else
+	mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t packet;
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+	mav_array_memcpy(packet.led_red, led_red, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_blue, led_blue, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_green, led_green, sizeof(uint8_t)*4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 46);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST;
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 46, 130);
+}
+
+/**
+ * @brief Encode a set_quad_swarm_led_roll_pitch_yaw_thrust struct into a message
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param msg The MAVLink message to compress the data into
+ * @param set_quad_swarm_led_roll_pitch_yaw_thrust C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t* set_quad_swarm_led_roll_pitch_yaw_thrust)
+{
+	return mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_pack(system_id, component_id, msg, set_quad_swarm_led_roll_pitch_yaw_thrust->group, set_quad_swarm_led_roll_pitch_yaw_thrust->mode, set_quad_swarm_led_roll_pitch_yaw_thrust->led_red, set_quad_swarm_led_roll_pitch_yaw_thrust->led_blue, set_quad_swarm_led_roll_pitch_yaw_thrust->led_green, set_quad_swarm_led_roll_pitch_yaw_thrust->roll, set_quad_swarm_led_roll_pitch_yaw_thrust->pitch, set_quad_swarm_led_roll_pitch_yaw_thrust->yaw, set_quad_swarm_led_roll_pitch_yaw_thrust->thrust);
+}
+
+/**
+ * @brief Send a set_quad_swarm_led_roll_pitch_yaw_thrust message
+ * @param chan MAVLink channel to send the message
+ *
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param led_red RGB red channel (0-255)
+ * @param led_blue RGB green channel (0-255)
+ * @param led_green RGB blue channel (0-255)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
+ */
+#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+
+static inline void mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_send(mavlink_channel_t chan, uint8_t group, uint8_t mode, const uint8_t *led_red, const uint8_t *led_blue, const uint8_t *led_green, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[46];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+	_mav_put_uint8_t_array(buf, 34, led_red, 4);
+	_mav_put_uint8_t_array(buf, 38, led_blue, 4);
+	_mav_put_uint8_t_array(buf, 42, led_green, 4);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, buf, 46, 130);
+#else
+	mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t packet;
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+	mav_array_memcpy(packet.led_red, led_red, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_blue, led_blue, sizeof(uint8_t)*4);
+	mav_array_memcpy(packet.led_green, led_green, sizeof(uint8_t)*4);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, (const char *)&packet, 46, 130);
+#endif
+}
+
+#endif
+
+// MESSAGE SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST UNPACKING
+
+
+/**
+ * @brief Get field group from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ */
+static inline uint8_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_group(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  32);
+}
+
+/**
+ * @brief Get field mode from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return ID of the flight mode (0 - 255, up to 256 modes supported)
+ */
+static inline uint8_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_mode(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  33);
+}
+
+/**
+ * @brief Get field led_red from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return RGB red channel (0-255)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_red(const mavlink_message_t* msg, uint8_t *led_red)
+{
+	return _MAV_RETURN_uint8_t_array(msg, led_red, 4,  34);
+}
+
+/**
+ * @brief Get field led_blue from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return RGB green channel (0-255)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_blue(const mavlink_message_t* msg, uint8_t *led_blue)
+{
+	return _MAV_RETURN_uint8_t_array(msg, led_blue, 4,  38);
+}
+
+/**
+ * @brief Get field led_green from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return RGB blue channel (0-255)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_green(const mavlink_message_t* msg, uint8_t *led_green)
+{
+	return _MAV_RETURN_uint8_t_array(msg, led_green, 4,  42);
+}
+
+/**
+ * @brief Get field roll from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return Desired roll angle in radians +-PI (+-32767)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_roll(const mavlink_message_t* msg, int16_t *roll)
+{
+	return _MAV_RETURN_int16_t_array(msg, roll, 4,  0);
+}
+
+/**
+ * @brief Get field pitch from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return Desired pitch angle in radians +-PI (+-32767)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_pitch(const mavlink_message_t* msg, int16_t *pitch)
+{
+	return _MAV_RETURN_int16_t_array(msg, pitch, 4,  8);
+}
+
+/**
+ * @brief Get field yaw from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_yaw(const mavlink_message_t* msg, int16_t *yaw)
+{
+	return _MAV_RETURN_int16_t_array(msg, yaw, 4,  16);
+}
+
+/**
+ * @brief Get field thrust from set_quad_swarm_led_roll_pitch_yaw_thrust message
+ *
+ * @return Collective thrust, scaled to uint16 (0..65535)
+ */
+static inline uint16_t mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_thrust(const mavlink_message_t* msg, uint16_t *thrust)
+{
+	return _MAV_RETURN_uint16_t_array(msg, thrust, 4,  24);
+}
+
+/**
+ * @brief Decode a set_quad_swarm_led_roll_pitch_yaw_thrust message into a struct
+ *
+ * @param msg The message to decode
+ * @param set_quad_swarm_led_roll_pitch_yaw_thrust C-struct to decode the message contents into
+ */
+static inline void mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(const mavlink_message_t* msg, mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t* set_quad_swarm_led_roll_pitch_yaw_thrust)
+{
+#if MAVLINK_NEED_BYTE_SWAP
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_roll(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->roll);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_pitch(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->pitch);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_yaw(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->yaw);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_thrust(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->thrust);
+	set_quad_swarm_led_roll_pitch_yaw_thrust->group = mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_group(msg);
+	set_quad_swarm_led_roll_pitch_yaw_thrust->mode = mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_mode(msg);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_red(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->led_red);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_blue(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->led_blue);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_get_led_green(msg, set_quad_swarm_led_roll_pitch_yaw_thrust->led_green);
+#else
+	memcpy(set_quad_swarm_led_roll_pitch_yaw_thrust, _MAV_PAYLOAD(msg), 46);
+#endif
+}
diff --git a/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h b/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h
index c3ea8de40..35c5db18c 100644
--- a/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h
+++ b/mavlink/include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h
@@ -4,30 +4,31 @@
 
 typedef struct __mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t
 {
- int16_t roll[6]; ///< Desired roll angle in radians, scaled to int16 for 6 quadrotors: 0..5
- int16_t pitch[6]; ///< Desired pitch angle in radians, scaled to int16 for 6 quadrotors: 0..5
- int16_t yaw[6]; ///< Desired yaw angle in radians, scaled to int16 for 6 quadrotors: 0..5
- uint16_t thrust[6]; ///< Collective thrust, scaled to uint16 for 6 quadrotors: 0..5
- uint8_t target_systems[6]; ///< System IDs for 6 quadrotors: 0..5, the ID's are the MAVLink IDs
+ int16_t roll[4]; ///< Desired roll angle in radians +-PI (+-32767)
+ int16_t pitch[4]; ///< Desired pitch angle in radians +-PI (+-32767)
+ int16_t yaw[4]; ///< Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ uint16_t thrust[4]; ///< Collective thrust, scaled to uint16 (0..65535)
+ uint8_t group; ///< ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ uint8_t mode; ///< ID of the flight mode (0 - 255, up to 256 modes supported)
 } mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t;
 
-#define MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_LEN 54
-#define MAVLINK_MSG_ID_61_LEN 54
+#define MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_LEN 34
+#define MAVLINK_MSG_ID_61_LEN 34
 
-#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_ROLL_LEN 6
-#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_PITCH_LEN 6
-#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_YAW_LEN 6
-#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_THRUST_LEN 6
-#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_TARGET_SYSTEMS_LEN 6
+#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_ROLL_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_PITCH_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_YAW_LEN 4
+#define MAVLINK_MSG_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST_FIELD_THRUST_LEN 4
 
 #define MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST { \
 	"SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST", \
-	5, \
-	{  { "roll", NULL, MAVLINK_TYPE_INT16_T, 6, 0, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, roll) }, \
-         { "pitch", NULL, MAVLINK_TYPE_INT16_T, 6, 12, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, pitch) }, \
-         { "yaw", NULL, MAVLINK_TYPE_INT16_T, 6, 24, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, yaw) }, \
-         { "thrust", NULL, MAVLINK_TYPE_UINT16_T, 6, 36, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, thrust) }, \
-         { "target_systems", NULL, MAVLINK_TYPE_UINT8_T, 6, 48, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, target_systems) }, \
+	6, \
+	{  { "roll", NULL, MAVLINK_TYPE_INT16_T, 4, 0, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, roll) }, \
+         { "pitch", NULL, MAVLINK_TYPE_INT16_T, 4, 8, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, pitch) }, \
+         { "yaw", NULL, MAVLINK_TYPE_INT16_T, 4, 16, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, yaw) }, \
+         { "thrust", NULL, MAVLINK_TYPE_UINT16_T, 4, 24, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, thrust) }, \
+         { "group", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, group) }, \
+         { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 33, offsetof(mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t, mode) }, \
          } \
 }
 
@@ -38,38 +39,39 @@ typedef struct __mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param msg The MAVLink message to compress the data into
  *
- * @param target_systems System IDs for 6 quadrotors: 0..5, the ID's are the MAVLink IDs
- * @param roll Desired roll angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param pitch Desired pitch angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param yaw Desired yaw angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param thrust Collective thrust, scaled to uint16 for 6 quadrotors: 0..5
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const uint8_t *target_systems, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
+						       uint8_t group, uint8_t mode, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[54];
-
-	_mav_put_int16_t_array(buf, 0, roll, 6);
-	_mav_put_int16_t_array(buf, 12, pitch, 6);
-	_mav_put_int16_t_array(buf, 24, yaw, 6);
-	_mav_put_uint16_t_array(buf, 36, thrust, 6);
-	_mav_put_uint8_t_array(buf, 48, target_systems, 6);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 54);
+	char buf[34];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 34);
 #else
 	mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t packet;
-
-	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*6);
-	mav_array_memcpy(packet.target_systems, target_systems, sizeof(uint8_t)*6);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 54);
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 34);
 #endif
 
 	msg->msgid = MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST;
-	return mavlink_finalize_message(msg, system_id, component_id, 54, 200);
+	return mavlink_finalize_message(msg, system_id, component_id, 34, 240);
 }
 
 /**
@@ -78,39 +80,40 @@ static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(uin
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param chan The MAVLink channel this message was sent over
  * @param msg The MAVLink message to compress the data into
- * @param target_systems System IDs for 6 quadrotors: 0..5, the ID's are the MAVLink IDs
- * @param roll Desired roll angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param pitch Desired pitch angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param yaw Desired yaw angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param thrust Collective thrust, scaled to uint16 for 6 quadrotors: 0..5
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
 							   mavlink_message_t* msg,
-						           const uint8_t *target_systems,const int16_t *roll,const int16_t *pitch,const int16_t *yaw,const uint16_t *thrust)
+						           uint8_t group,uint8_t mode,const int16_t *roll,const int16_t *pitch,const int16_t *yaw,const uint16_t *thrust)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[54];
-
-	_mav_put_int16_t_array(buf, 0, roll, 6);
-	_mav_put_int16_t_array(buf, 12, pitch, 6);
-	_mav_put_int16_t_array(buf, 24, yaw, 6);
-	_mav_put_uint16_t_array(buf, 36, thrust, 6);
-	_mav_put_uint8_t_array(buf, 48, target_systems, 6);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 54);
+	char buf[34];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 34);
 #else
 	mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t packet;
-
-	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*6);
-	mav_array_memcpy(packet.target_systems, target_systems, sizeof(uint8_t)*6);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 54);
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 34);
 #endif
 
 	msg->msgid = MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 54, 200);
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 34, 240);
 }
 
 /**
@@ -123,41 +126,42 @@ static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack_cha
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t* set_quad_swarm_roll_pitch_yaw_thrust)
 {
-	return mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(system_id, component_id, msg, set_quad_swarm_roll_pitch_yaw_thrust->target_systems, set_quad_swarm_roll_pitch_yaw_thrust->roll, set_quad_swarm_roll_pitch_yaw_thrust->pitch, set_quad_swarm_roll_pitch_yaw_thrust->yaw, set_quad_swarm_roll_pitch_yaw_thrust->thrust);
+	return mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(system_id, component_id, msg, set_quad_swarm_roll_pitch_yaw_thrust->group, set_quad_swarm_roll_pitch_yaw_thrust->mode, set_quad_swarm_roll_pitch_yaw_thrust->roll, set_quad_swarm_roll_pitch_yaw_thrust->pitch, set_quad_swarm_roll_pitch_yaw_thrust->yaw, set_quad_swarm_roll_pitch_yaw_thrust->thrust);
 }
 
 /**
  * @brief Send a set_quad_swarm_roll_pitch_yaw_thrust message
  * @param chan MAVLink channel to send the message
  *
- * @param target_systems System IDs for 6 quadrotors: 0..5, the ID's are the MAVLink IDs
- * @param roll Desired roll angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param pitch Desired pitch angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param yaw Desired yaw angle in radians, scaled to int16 for 6 quadrotors: 0..5
- * @param thrust Collective thrust, scaled to uint16 for 6 quadrotors: 0..5
+ * @param group ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ * @param mode ID of the flight mode (0 - 255, up to 256 modes supported)
+ * @param roll Desired roll angle in radians +-PI (+-32767)
+ * @param pitch Desired pitch angle in radians +-PI (+-32767)
+ * @param yaw Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
+ * @param thrust Collective thrust, scaled to uint16 (0..65535)
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_send(mavlink_channel_t chan, const uint8_t *target_systems, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
+static inline void mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_send(mavlink_channel_t chan, uint8_t group, uint8_t mode, const int16_t *roll, const int16_t *pitch, const int16_t *yaw, const uint16_t *thrust)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[54];
-
-	_mav_put_int16_t_array(buf, 0, roll, 6);
-	_mav_put_int16_t_array(buf, 12, pitch, 6);
-	_mav_put_int16_t_array(buf, 24, yaw, 6);
-	_mav_put_uint16_t_array(buf, 36, thrust, 6);
-	_mav_put_uint8_t_array(buf, 48, target_systems, 6);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, buf, 54, 200);
+	char buf[34];
+	_mav_put_uint8_t(buf, 32, group);
+	_mav_put_uint8_t(buf, 33, mode);
+	_mav_put_int16_t_array(buf, 0, roll, 4);
+	_mav_put_int16_t_array(buf, 8, pitch, 4);
+	_mav_put_int16_t_array(buf, 16, yaw, 4);
+	_mav_put_uint16_t_array(buf, 24, thrust, 4);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, buf, 34, 240);
 #else
 	mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t packet;
-
-	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*6);
-	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*6);
-	mav_array_memcpy(packet.target_systems, target_systems, sizeof(uint8_t)*6);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, (const char *)&packet, 54, 200);
+	packet.group = group;
+	packet.mode = mode;
+	mav_array_memcpy(packet.roll, roll, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.pitch, pitch, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.yaw, yaw, sizeof(int16_t)*4);
+	mav_array_memcpy(packet.thrust, thrust, sizeof(uint16_t)*4);
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, (const char *)&packet, 34, 240);
 #endif
 }
 
@@ -167,53 +171,63 @@ static inline void mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_send(mavlink
 
 
 /**
- * @brief Get field target_systems from set_quad_swarm_roll_pitch_yaw_thrust message
+ * @brief Get field group from set_quad_swarm_roll_pitch_yaw_thrust message
+ *
+ * @return ID of the quadrotor group (0 - 255, up to 256 groups supported)
+ */
+static inline uint8_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_group(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  32);
+}
+
+/**
+ * @brief Get field mode from set_quad_swarm_roll_pitch_yaw_thrust message
  *
- * @return System IDs for 6 quadrotors: 0..5, the ID's are the MAVLink IDs
+ * @return ID of the flight mode (0 - 255, up to 256 modes supported)
  */
-static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_target_systems(const mavlink_message_t* msg, uint8_t *target_systems)
+static inline uint8_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_mode(const mavlink_message_t* msg)
 {
-	return _MAV_RETURN_uint8_t_array(msg, target_systems, 6,  48);
+	return _MAV_RETURN_uint8_t(msg,  33);
 }
 
 /**
  * @brief Get field roll from set_quad_swarm_roll_pitch_yaw_thrust message
  *
- * @return Desired roll angle in radians, scaled to int16 for 6 quadrotors: 0..5
+ * @return Desired roll angle in radians +-PI (+-32767)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_roll(const mavlink_message_t* msg, int16_t *roll)
 {
-	return _MAV_RETURN_int16_t_array(msg, roll, 6,  0);
+	return _MAV_RETURN_int16_t_array(msg, roll, 4,  0);
 }
 
 /**
  * @brief Get field pitch from set_quad_swarm_roll_pitch_yaw_thrust message
  *
- * @return Desired pitch angle in radians, scaled to int16 for 6 quadrotors: 0..5
+ * @return Desired pitch angle in radians +-PI (+-32767)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_pitch(const mavlink_message_t* msg, int16_t *pitch)
 {
-	return _MAV_RETURN_int16_t_array(msg, pitch, 6,  12);
+	return _MAV_RETURN_int16_t_array(msg, pitch, 4,  8);
 }
 
 /**
  * @brief Get field yaw from set_quad_swarm_roll_pitch_yaw_thrust message
  *
- * @return Desired yaw angle in radians, scaled to int16 for 6 quadrotors: 0..5
+ * @return Desired yaw angle in radians, scaled to int16 +-PI (+-32767)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_yaw(const mavlink_message_t* msg, int16_t *yaw)
 {
-	return _MAV_RETURN_int16_t_array(msg, yaw, 6,  24);
+	return _MAV_RETURN_int16_t_array(msg, yaw, 4,  16);
 }
 
 /**
  * @brief Get field thrust from set_quad_swarm_roll_pitch_yaw_thrust message
  *
- * @return Collective thrust, scaled to uint16 for 6 quadrotors: 0..5
+ * @return Collective thrust, scaled to uint16 (0..65535)
  */
 static inline uint16_t mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_thrust(const mavlink_message_t* msg, uint16_t *thrust)
 {
-	return _MAV_RETURN_uint16_t_array(msg, thrust, 6,  36);
+	return _MAV_RETURN_uint16_t_array(msg, thrust, 4,  24);
 }
 
 /**
@@ -229,8 +243,9 @@ static inline void mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_decode(const
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_pitch(msg, set_quad_swarm_roll_pitch_yaw_thrust->pitch);
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_yaw(msg, set_quad_swarm_roll_pitch_yaw_thrust->yaw);
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_thrust(msg, set_quad_swarm_roll_pitch_yaw_thrust->thrust);
-	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_target_systems(msg, set_quad_swarm_roll_pitch_yaw_thrust->target_systems);
+	set_quad_swarm_roll_pitch_yaw_thrust->group = mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_group(msg);
+	set_quad_swarm_roll_pitch_yaw_thrust->mode = mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_get_mode(msg);
 #else
-	memcpy(set_quad_swarm_roll_pitch_yaw_thrust, _MAV_PAYLOAD(msg), 54);
+	memcpy(set_quad_swarm_roll_pitch_yaw_thrust, _MAV_PAYLOAD(msg), 34);
 #endif
 }
diff --git a/mavlink/include/mavlink/v1.0/common/testsuite.h b/mavlink/include/mavlink/v1.0/common/testsuite.h
index 5459a61a5..b28ed0429 100644
--- a/mavlink/include/mavlink/v1.0/common/testsuite.h
+++ b/mavlink/include/mavlink/v1.0/common/testsuite.h
@@ -2583,20 +2583,22 @@ static void mavlink_test_set_quad_swarm_roll_pitch_yaw_thrust(uint8_t system_id,
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t packet_in = {
-		{ 17235, 17236, 17237, 17238, 17239, 17240 },
-	{ 17859, 17860, 17861, 17862, 17863, 17864 },
-	{ 18483, 18484, 18485, 18486, 18487, 18488 },
-	{ 19107, 19108, 19109, 19110, 19111, 19112 },
-	{ 149, 150, 151, 152, 153, 154 },
+		{ 17235, 17236, 17237, 17238 },
+	{ 17651, 17652, 17653, 17654 },
+	{ 18067, 18068, 18069, 18070 },
+	{ 18483, 18484, 18485, 18486 },
+	101,
+	168,
 	};
 	mavlink_set_quad_swarm_roll_pitch_yaw_thrust_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
+        	packet1.group = packet_in.group;
+        	packet1.mode = packet_in.mode;
         
-        	mav_array_memcpy(packet1.roll, packet_in.roll, sizeof(int16_t)*6);
-        	mav_array_memcpy(packet1.pitch, packet_in.pitch, sizeof(int16_t)*6);
-        	mav_array_memcpy(packet1.yaw, packet_in.yaw, sizeof(int16_t)*6);
-        	mav_array_memcpy(packet1.thrust, packet_in.thrust, sizeof(uint16_t)*6);
-        	mav_array_memcpy(packet1.target_systems, packet_in.target_systems, sizeof(uint8_t)*6);
+        	mav_array_memcpy(packet1.roll, packet_in.roll, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.pitch, packet_in.pitch, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.yaw, packet_in.yaw, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.thrust, packet_in.thrust, sizeof(uint16_t)*4);
         
 
         memset(&packet2, 0, sizeof(packet2));
@@ -2605,12 +2607,12 @@ static void mavlink_test_set_quad_swarm_roll_pitch_yaw_thrust(uint8_t system_id,
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(system_id, component_id, &msg , packet1.target_systems , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack(system_id, component_id, &msg , packet1.group , packet1.mode , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_systems , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.group , packet1.mode , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -2623,7 +2625,7 @@ static void mavlink_test_set_quad_swarm_roll_pitch_yaw_thrust(uint8_t system_id,
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_send(MAVLINK_COMM_1 , packet1.target_systems , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_send(MAVLINK_COMM_1 , packet1.group , packet1.mode , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
 	mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust_decode(last_msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
@@ -2685,6 +2687,65 @@ static void mavlink_test_nav_controller_output(uint8_t system_id, uint8_t compon
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
 
+static void mavlink_test_set_quad_swarm_led_roll_pitch_yaw_thrust(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
+{
+	mavlink_message_t msg;
+        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
+        uint16_t i;
+	mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t packet_in = {
+		{ 17235, 17236, 17237, 17238 },
+	{ 17651, 17652, 17653, 17654 },
+	{ 18067, 18068, 18069, 18070 },
+	{ 18483, 18484, 18485, 18486 },
+	101,
+	168,
+	{ 235, 236, 237, 238 },
+	{ 247, 248, 249, 250 },
+	{ 3, 4, 5, 6 },
+	};
+	mavlink_set_quad_swarm_led_roll_pitch_yaw_thrust_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.group = packet_in.group;
+        	packet1.mode = packet_in.mode;
+        
+        	mav_array_memcpy(packet1.roll, packet_in.roll, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.pitch, packet_in.pitch, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.yaw, packet_in.yaw, sizeof(int16_t)*4);
+        	mav_array_memcpy(packet1.thrust, packet_in.thrust, sizeof(uint16_t)*4);
+        	mav_array_memcpy(packet1.led_red, packet_in.led_red, sizeof(uint8_t)*4);
+        	mav_array_memcpy(packet1.led_blue, packet_in.led_blue, sizeof(uint8_t)*4);
+        	mav_array_memcpy(packet1.led_green, packet_in.led_green, sizeof(uint8_t)*4);
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_pack(system_id, component_id, &msg , packet1.group , packet1.mode , packet1.led_red , packet1.led_blue , packet1.led_green , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.group , packet1.mode , packet1.led_red , packet1.led_blue , packet1.led_green , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+        mavlink_msg_to_send_buffer(buffer, &msg);
+        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
+        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
+        }
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_send(MAVLINK_COMM_1 , packet1.group , packet1.mode , packet1.led_red , packet1.led_blue , packet1.led_green , packet1.roll , packet1.pitch , packet1.yaw , packet1.thrust );
+	mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
 static void mavlink_test_state_correction(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
 {
 	mavlink_message_t msg;
@@ -3993,6 +4054,7 @@ static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink
 	mavlink_test_set_quad_motors_setpoint(system_id, component_id, last_msg);
 	mavlink_test_set_quad_swarm_roll_pitch_yaw_thrust(system_id, component_id, last_msg);
 	mavlink_test_nav_controller_output(system_id, component_id, last_msg);
+	mavlink_test_set_quad_swarm_led_roll_pitch_yaw_thrust(system_id, component_id, last_msg);
 	mavlink_test_state_correction(system_id, component_id, last_msg);
 	mavlink_test_request_data_stream(system_id, component_id, last_msg);
 	mavlink_test_data_stream(system_id, component_id, last_msg);
diff --git a/mavlink/include/mavlink/v1.0/common/version.h b/mavlink/include/mavlink/v1.0/common/version.h
index 1d7913646..5a0ce2af9 100644
--- a/mavlink/include/mavlink/v1.0/common/version.h
+++ b/mavlink/include/mavlink/v1.0/common/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sat Apr 28 21:01:04 2012"
+#define MAVLINK_BUILD_DATE "Thu Aug 23 16:39:58 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/mavlink/include/mavlink/v1.0/matrixpilot/matrixpilot.h b/mavlink/include/mavlink/v1.0/matrixpilot/matrixpilot.h
index 6d2a9b23e..72a446ca4 100644
--- a/mavlink/include/mavlink/v1.0/matrixpilot/matrixpilot.h
+++ b/mavlink/include/mavlink/v1.0/matrixpilot/matrixpilot.h
@@ -12,21 +12,25 @@ extern "C" {
 // MESSAGE LENGTHS AND CRCS
 
 #ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
+#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 34, 26, 46, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
+#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 240, 183, 130, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
+#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
 #endif
 
 #include "../protocol.h"
 
 #define MAVLINK_ENABLED_MATRIXPILOT
 
+// ENUM DEFINITIONS
+
+
+
 #include "../common/common.h"
 
 // MAVLINK VERSION
@@ -40,10 +44,6 @@ extern "C" {
 #define MAVLINK_VERSION 2
 #endif
 
-// ENUM DEFINITIONS
-
-
-
 // MESSAGE DEFINITIONS
 
 
diff --git a/mavlink/include/mavlink/v1.0/matrixpilot/version.h b/mavlink/include/mavlink/v1.0/matrixpilot/version.h
index 1afb38ab6..be921348b 100644
--- a/mavlink/include/mavlink/v1.0/matrixpilot/version.h
+++ b/mavlink/include/mavlink/v1.0/matrixpilot/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:49 2012"
+#define MAVLINK_BUILD_DATE "Thu Aug 23 16:39:29 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/mavlink/include/mavlink/v1.0/mavlink_helpers.h b/mavlink/include/mavlink/v1.0/mavlink_helpers.h
index 39d6930e5..28ef24cbf 100644
--- a/mavlink/include/mavlink/v1.0/mavlink_helpers.h
+++ b/mavlink/include/mavlink/v1.0/mavlink_helpers.h
@@ -131,6 +131,24 @@ MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint
 	_mavlink_send_uart(chan, (const char *)ck, 2);
 	MAVLINK_END_UART_SEND(chan, MAVLINK_NUM_NON_PAYLOAD_BYTES + (uint16_t)length);
 }
+
+/**
+ * @brief re-send a message over a uart channel
+ * this is more stack efficient than re-marshalling the message
+ */
+MAVLINK_HELPER void _mavlink_resend_uart(mavlink_channel_t chan, const mavlink_message_t *msg)
+{
+	uint8_t ck[2];
+
+	ck[0] = (uint8_t)(msg->checksum & 0xFF);
+	ck[1] = (uint8_t)(msg->checksum >> 8);
+
+	MAVLINK_START_UART_SEND(chan, MAVLINK_NUM_NON_PAYLOAD_BYTES + msg->len);
+	_mavlink_send_uart(chan, (const char *)&msg->magic, MAVLINK_NUM_HEADER_BYTES);
+	_mavlink_send_uart(chan, _MAV_PAYLOAD(msg), msg->len);
+	_mavlink_send_uart(chan, (const char *)ck, 2);
+	MAVLINK_END_UART_SEND(chan, MAVLINK_NUM_NON_PAYLOAD_BYTES + msg->len);
+}
 #endif // MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
 /**
@@ -211,6 +229,19 @@ MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_messa
 #endif
 #endif
 
+/* Enable this option to check the length of each message.
+ This allows invalid messages to be caught much sooner. Use if the transmission
+ medium is prone to missing (or extra) characters (e.g. a radio that fades in
+ and out). Only use if the channel will only contain messages types listed in
+ the headers.
+*/
+#if MAVLINK_CHECK_MESSAGE_LENGTH
+#ifndef MAVLINK_MESSAGE_LENGTH
+	static const uint8_t mavlink_message_lengths[256] = MAVLINK_MESSAGE_LENGTHS;
+#define MAVLINK_MESSAGE_LENGTH(msgid) mavlink_message_lengths[msgid]
+#endif
+#endif
+
 	mavlink_message_t* rxmsg = mavlink_get_channel_buffer(chan); ///< The currently decoded message
 	mavlink_status_t* status = mavlink_get_channel_status(chan); ///< The current decode status
 	int bufferIndex = 0;
@@ -273,6 +304,19 @@ MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_messa
 		break;
 
 	case MAVLINK_PARSE_STATE_GOT_COMPID:
+#if MAVLINK_CHECK_MESSAGE_LENGTH
+	        if (rxmsg->len != MAVLINK_MESSAGE_LENGTH(c))
+		{
+			status->parse_error++;
+			status->parse_state = MAVLINK_PARSE_STATE_IDLE;
+			break;
+			if (c == MAVLINK_STX)
+			{
+				status->parse_state = MAVLINK_PARSE_STATE_GOT_STX;
+				mavlink_start_checksum(rxmsg);
+			}
+	        }
+#endif
 		rxmsg->msgid = c;
 		mavlink_update_checksum(rxmsg, c);
 		if (rxmsg->len == 0)
diff --git a/mavlink/include/mavlink/v1.0/minimal/mavlink.h b/mavlink/include/mavlink/v1.0/minimal/mavlink.h
deleted file mode 100644
index 0a759b618..000000000
--- a/mavlink/include/mavlink/v1.0/minimal/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from minimal.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 254
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_LITTLE_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 1
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 1
-#endif
-
-#include "version.h"
-#include "minimal.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v1.0/minimal/mavlink_msg_heartbeat.h b/mavlink/include/mavlink/v1.0/minimal/mavlink_msg_heartbeat.h
deleted file mode 100644
index 350338707..000000000
--- a/mavlink/include/mavlink/v1.0/minimal/mavlink_msg_heartbeat.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// MESSAGE HEARTBEAT PACKING
-
-#define MAVLINK_MSG_ID_HEARTBEAT 0
-
-typedef struct __mavlink_heartbeat_t
-{
- uint32_t custom_mode; ///< A bitfield for use for autopilot-specific flags.
- uint8_t type; ///< Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- uint8_t autopilot; ///< Autopilot type / class. defined in MAV_AUTOPILOT ENUM
- uint8_t base_mode; ///< System mode bitfield, see MAV_MODE_FLAGS ENUM in mavlink/include/mavlink_types.h
- uint8_t system_status; ///< System status flag, see MAV_STATE ENUM
- uint8_t mavlink_version; ///< MAVLink version
-} mavlink_heartbeat_t;
-
-#define MAVLINK_MSG_ID_HEARTBEAT_LEN 9
-#define MAVLINK_MSG_ID_0_LEN 9
-
-
-
-#define MAVLINK_MESSAGE_INFO_HEARTBEAT { \
-	"HEARTBEAT", \
-	6, \
-	{  { "custom_mode", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_heartbeat_t, custom_mode) }, \
-         { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_heartbeat_t, type) }, \
-         { "autopilot", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_heartbeat_t, autopilot) }, \
-         { "base_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_heartbeat_t, base_mode) }, \
-         { "system_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_heartbeat_t, system_status) }, \
-         { "mavlink_version", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_heartbeat_t, mavlink_version) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a heartbeat message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Autopilot type / class. defined in MAV_AUTOPILOT ENUM
- * @param base_mode System mode bitfield, see MAV_MODE_FLAGS ENUM in mavlink/include/mavlink_types.h
- * @param custom_mode A bitfield for use for autopilot-specific flags.
- * @param system_status System status flag, see MAV_STATE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t type, uint8_t autopilot, uint8_t base_mode, uint32_t custom_mode, uint8_t system_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint32_t(buf, 0, custom_mode);
-	_mav_put_uint8_t(buf, 4, type);
-	_mav_put_uint8_t(buf, 5, autopilot);
-	_mav_put_uint8_t(buf, 6, base_mode);
-	_mav_put_uint8_t(buf, 7, system_status);
-	_mav_put_uint8_t(buf, 8, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 9);
-#else
-	mavlink_heartbeat_t packet;
-	packet.custom_mode = custom_mode;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.base_mode = base_mode;
-	packet.system_status = system_status;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 9);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message(msg, system_id, component_id, 9, 50);
-}
-
-/**
- * @brief Pack a heartbeat message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Autopilot type / class. defined in MAV_AUTOPILOT ENUM
- * @param base_mode System mode bitfield, see MAV_MODE_FLAGS ENUM in mavlink/include/mavlink_types.h
- * @param custom_mode A bitfield for use for autopilot-specific flags.
- * @param system_status System status flag, see MAV_STATE ENUM
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_heartbeat_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t type,uint8_t autopilot,uint8_t base_mode,uint32_t custom_mode,uint8_t system_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint32_t(buf, 0, custom_mode);
-	_mav_put_uint8_t(buf, 4, type);
-	_mav_put_uint8_t(buf, 5, autopilot);
-	_mav_put_uint8_t(buf, 6, base_mode);
-	_mav_put_uint8_t(buf, 7, system_status);
-	_mav_put_uint8_t(buf, 8, 2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 9);
-#else
-	mavlink_heartbeat_t packet;
-	packet.custom_mode = custom_mode;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.base_mode = base_mode;
-	packet.system_status = system_status;
-	packet.mavlink_version = 2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 9);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_HEARTBEAT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 9, 50);
-}
-
-/**
- * @brief Encode a heartbeat struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param heartbeat C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_heartbeat_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_heartbeat_t* heartbeat)
-{
-	return mavlink_msg_heartbeat_pack(system_id, component_id, msg, heartbeat->type, heartbeat->autopilot, heartbeat->base_mode, heartbeat->custom_mode, heartbeat->system_status);
-}
-
-/**
- * @brief Send a heartbeat message
- * @param chan MAVLink channel to send the message
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- * @param autopilot Autopilot type / class. defined in MAV_AUTOPILOT ENUM
- * @param base_mode System mode bitfield, see MAV_MODE_FLAGS ENUM in mavlink/include/mavlink_types.h
- * @param custom_mode A bitfield for use for autopilot-specific flags.
- * @param system_status System status flag, see MAV_STATE ENUM
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_heartbeat_send(mavlink_channel_t chan, uint8_t type, uint8_t autopilot, uint8_t base_mode, uint32_t custom_mode, uint8_t system_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[9];
-	_mav_put_uint32_t(buf, 0, custom_mode);
-	_mav_put_uint8_t(buf, 4, type);
-	_mav_put_uint8_t(buf, 5, autopilot);
-	_mav_put_uint8_t(buf, 6, base_mode);
-	_mav_put_uint8_t(buf, 7, system_status);
-	_mav_put_uint8_t(buf, 8, 2);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, buf, 9, 50);
-#else
-	mavlink_heartbeat_t packet;
-	packet.custom_mode = custom_mode;
-	packet.type = type;
-	packet.autopilot = autopilot;
-	packet.base_mode = base_mode;
-	packet.system_status = system_status;
-	packet.mavlink_version = 2;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_HEARTBEAT, (const char *)&packet, 9, 50);
-#endif
-}
-
-#endif
-
-// MESSAGE HEARTBEAT UNPACKING
-
-
-/**
- * @brief Get field type from heartbeat message
- *
- * @return Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
- */
-static inline uint8_t mavlink_msg_heartbeat_get_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field autopilot from heartbeat message
- *
- * @return Autopilot type / class. defined in MAV_AUTOPILOT ENUM
- */
-static inline uint8_t mavlink_msg_heartbeat_get_autopilot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field base_mode from heartbeat message
- *
- * @return System mode bitfield, see MAV_MODE_FLAGS ENUM in mavlink/include/mavlink_types.h
- */
-static inline uint8_t mavlink_msg_heartbeat_get_base_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field custom_mode from heartbeat message
- *
- * @return A bitfield for use for autopilot-specific flags.
- */
-static inline uint32_t mavlink_msg_heartbeat_get_custom_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Get field system_status from heartbeat message
- *
- * @return System status flag, see MAV_STATE ENUM
- */
-static inline uint8_t mavlink_msg_heartbeat_get_system_status(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Get field mavlink_version from heartbeat message
- *
- * @return MAVLink version
- */
-static inline uint8_t mavlink_msg_heartbeat_get_mavlink_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Decode a heartbeat message into a struct
- *
- * @param msg The message to decode
- * @param heartbeat C-struct to decode the message contents into
- */
-static inline void mavlink_msg_heartbeat_decode(const mavlink_message_t* msg, mavlink_heartbeat_t* heartbeat)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	heartbeat->custom_mode = mavlink_msg_heartbeat_get_custom_mode(msg);
-	heartbeat->type = mavlink_msg_heartbeat_get_type(msg);
-	heartbeat->autopilot = mavlink_msg_heartbeat_get_autopilot(msg);
-	heartbeat->base_mode = mavlink_msg_heartbeat_get_base_mode(msg);
-	heartbeat->system_status = mavlink_msg_heartbeat_get_system_status(msg);
-	heartbeat->mavlink_version = mavlink_msg_heartbeat_get_mavlink_version(msg);
-#else
-	memcpy(heartbeat, _MAV_PAYLOAD(msg), 9);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/minimal/minimal.h b/mavlink/include/mavlink/v1.0/minimal/minimal.h
deleted file mode 100644
index 30c6c1cdc..000000000
--- a/mavlink/include/mavlink/v1.0/minimal/minimal.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from minimal.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef MINIMAL_H
-#define MINIMAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_MINIMAL
-
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
-#endif
-
-// ENUM DEFINITIONS
-
-
-/** @brief Micro air vehicle / autopilot classes. This identifies the individual model. */
-#ifndef HAVE_ENUM_MAV_AUTOPILOT
-#define HAVE_ENUM_MAV_AUTOPILOT
-enum MAV_AUTOPILOT
-{
-	MAV_AUTOPILOT_GENERIC=0, /* Generic autopilot, full support for everything | */
-	MAV_AUTOPILOT_PIXHAWK=1, /* PIXHAWK autopilot, http://pixhawk.ethz.ch | */
-	MAV_AUTOPILOT_SLUGS=2, /* SLUGS autopilot, http://slugsuav.soe.ucsc.edu | */
-	MAV_AUTOPILOT_ARDUPILOTMEGA=3, /* ArduPilotMega / ArduCopter, http://diydrones.com | */
-	MAV_AUTOPILOT_OPENPILOT=4, /* OpenPilot, http://openpilot.org | */
-	MAV_AUTOPILOT_GENERIC_WAYPOINTS_ONLY=5, /* Generic autopilot only supporting simple waypoints | */
-	MAV_AUTOPILOT_GENERIC_WAYPOINTS_AND_SIMPLE_NAVIGATION_ONLY=6, /* Generic autopilot supporting waypoints and other simple navigation commands | */
-	MAV_AUTOPILOT_GENERIC_MISSION_FULL=7, /* Generic autopilot supporting the full mission command set | */
-	MAV_AUTOPILOT_INVALID=8, /* No valid autopilot, e.g. a GCS or other MAVLink component | */
-	MAV_AUTOPILOT_PPZ=9, /* PPZ UAV - http://nongnu.org/paparazzi | */
-	MAV_AUTOPILOT_UDB=10, /* UAV Dev Board | */
-	MAV_AUTOPILOT_FP=11, /* FlexiPilot | */
-	MAV_AUTOPILOT_ENUM_END=12, /*  | */
-};
-#endif
-
-/** @brief  */
-#ifndef HAVE_ENUM_MAV_TYPE
-#define HAVE_ENUM_MAV_TYPE
-enum MAV_TYPE
-{
-	MAV_TYPE_GENERIC=0, /* Generic micro air vehicle. | */
-	MAV_TYPE_FIXED_WING=1, /* Fixed wing aircraft. | */
-	MAV_TYPE_QUADROTOR=2, /* Quadrotor | */
-	MAV_TYPE_COAXIAL=3, /* Coaxial helicopter | */
-	MAV_TYPE_HELICOPTER=4, /* Normal helicopter with tail rotor. | */
-	MAV_TYPE_ANTENNA_TRACKER=5, /* Ground installation | */
-	MAV_TYPE_GCS=6, /* Operator control unit / ground control station | */
-	MAV_TYPE_AIRSHIP=7, /* Airship, controlled | */
-	MAV_TYPE_FREE_BALLOON=8, /* Free balloon, uncontrolled | */
-	MAV_TYPE_ROCKET=9, /* Rocket | */
-	MAV_TYPE_GROUND_ROVER=10, /* Ground rover | */
-	MAV_TYPE_SURFACE_BOAT=11, /* Surface vessel, boat, ship | */
-	MAV_TYPE_SUBMARINE=12, /* Submarine | */
-	MAV_TYPE_HEXAROTOR=13, /* Hexarotor | */
-	MAV_TYPE_OCTOROTOR=14, /* Octorotor | */
-	MAV_TYPE_TRICOPTER=15, /* Octorotor | */
-	MAV_TYPE_FLAPPING_WING=16, /* Flapping wing | */
-	MAV_TYPE_ENUM_END=17, /*  | */
-};
-#endif
-
-/** @brief These flags encode the MAV mode. */
-#ifndef HAVE_ENUM_MAV_MODE_FLAG
-#define HAVE_ENUM_MAV_MODE_FLAG
-enum MAV_MODE_FLAG
-{
-	MAV_MODE_FLAG_CUSTOM_MODE_ENABLED=1, /* 0b00000001 Reserved for future use. | */
-	MAV_MODE_FLAG_TEST_ENABLED=2, /* 0b00000010 system has a test mode enabled. This flag is intended for temporary system tests and should not be used for stable implementations. | */
-	MAV_MODE_FLAG_AUTO_ENABLED=4, /* 0b00000100 autonomous mode enabled, system finds its own goal positions. Guided flag can be set or not, depends on the actual implementation. | */
-	MAV_MODE_FLAG_GUIDED_ENABLED=8, /* 0b00001000 guided mode enabled, system flies MISSIONs / mission items. | */
-	MAV_MODE_FLAG_STABILIZE_ENABLED=16, /* 0b00010000 system stabilizes electronically its attitude (and optionally position). It needs however further control inputs to move around. | */
-	MAV_MODE_FLAG_HIL_ENABLED=32, /* 0b00100000 hardware in the loop simulation. All motors / actuators are blocked, but internal software is full operational. | */
-	MAV_MODE_FLAG_MANUAL_INPUT_ENABLED=64, /* 0b01000000 remote control input is enabled. | */
-	MAV_MODE_FLAG_SAFETY_ARMED=128, /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. | */
-	MAV_MODE_FLAG_ENUM_END=129, /*  | */
-};
-#endif
-
-/** @brief These values encode the bit positions of the decode position. These values can be used to read the value of a flag bit by combining the base_mode variable with AND with the flag position value. The result will be either 0 or 1, depending on if the flag is set or not. */
-#ifndef HAVE_ENUM_MAV_MODE_FLAG_DECODE_POSITION
-#define HAVE_ENUM_MAV_MODE_FLAG_DECODE_POSITION
-enum MAV_MODE_FLAG_DECODE_POSITION
-{
-	MAV_MODE_FLAG_DECODE_POSITION_CUSTOM_MODE=1, /* Eighth bit: 00000001 | */
-	MAV_MODE_FLAG_DECODE_POSITION_TEST=2, /* Seventh bit: 00000010 | */
-	MAV_MODE_FLAG_DECODE_POSITION_AUTO=4, /* Sixt bit:   00000100 | */
-	MAV_MODE_FLAG_DECODE_POSITION_GUIDED=8, /* Fifth bit:  00001000 | */
-	MAV_MODE_FLAG_DECODE_POSITION_STABILIZE=16, /* Fourth bit: 00010000 | */
-	MAV_MODE_FLAG_DECODE_POSITION_HIL=32, /* Third bit:  00100000 | */
-	MAV_MODE_FLAG_DECODE_POSITION_MANUAL=64, /* Second bit: 01000000 | */
-	MAV_MODE_FLAG_DECODE_POSITION_SAFETY=128, /* First bit:  10000000 | */
-	MAV_MODE_FLAG_DECODE_POSITION_ENUM_END=129, /*  | */
-};
-#endif
-
-/** @brief  */
-#ifndef HAVE_ENUM_MAV_STATE
-#define HAVE_ENUM_MAV_STATE
-enum MAV_STATE
-{
-	MAV_STATE_UNINIT=0, /* Uninitialized system, state is unknown. | */
-	MAV_STATE_BOOT=1, /* System is booting up. | */
-	MAV_STATE_CALIBRATING=2, /* System is calibrating and not flight-ready. | */
-	MAV_STATE_STANDBY=3, /* System is grounded and on standby. It can be launched any time. | */
-	MAV_STATE_ACTIVE=4, /* System is active and might be already airborne. Motors are engaged. | */
-	MAV_STATE_CRITICAL=5, /* System is in a non-normal flight mode. It can however still navigate. | */
-	MAV_STATE_EMERGENCY=6, /* System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down. | */
-	MAV_STATE_POWEROFF=7, /* System just initialized its power-down sequence, will shut down now. | */
-	MAV_STATE_ENUM_END=8, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_heartbeat.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // MINIMAL_H
diff --git a/mavlink/include/mavlink/v1.0/minimal/testsuite.h b/mavlink/include/mavlink/v1.0/minimal/testsuite.h
deleted file mode 100644
index 1758c912c..000000000
--- a/mavlink/include/mavlink/v1.0/minimal/testsuite.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from minimal.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef MINIMAL_TESTSUITE_H
-#define MINIMAL_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-
-static void mavlink_test_minimal(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-
-	mavlink_test_minimal(system_id, component_id, last_msg);
-}
-#endif
-
-
-
-
-static void mavlink_test_heartbeat(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_heartbeat_t packet_in = {
-		963497464,
-	17,
-	84,
-	151,
-	218,
-	2,
-	};
-	mavlink_heartbeat_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.custom_mode = packet_in.custom_mode;
-        	packet1.type = packet_in.type;
-        	packet1.autopilot = packet_in.autopilot;
-        	packet1.base_mode = packet_in.base_mode;
-        	packet1.system_status = packet_in.system_status;
-        	packet1.mavlink_version = packet_in.mavlink_version;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack(system_id, component_id, &msg , packet1.type , packet1.autopilot , packet1.base_mode , packet1.custom_mode , packet1.system_status );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.type , packet1.autopilot , packet1.base_mode , packet1.custom_mode , packet1.system_status );
-	mavlink_msg_heartbeat_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_heartbeat_send(MAVLINK_COMM_1 , packet1.type , packet1.autopilot , packet1.base_mode , packet1.custom_mode , packet1.system_status );
-	mavlink_msg_heartbeat_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_minimal(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_heartbeat(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // MINIMAL_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v1.0/minimal/version.h b/mavlink/include/mavlink/v1.0/minimal/version.h
deleted file mode 100644
index 240a634f9..000000000
--- a/mavlink/include/mavlink/v1.0/minimal/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from minimal.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:49 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.h b/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.h
index f98852ac9..db9c31edd 100644
--- a/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.h
+++ b/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.h
@@ -12,34 +12,21 @@ extern "C" {
 // MESSAGE LENGTHS AND CRCS
 
 #ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 52, 1, 92, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 16, 0, 0, 0, 0, 0, 0, 0, 4, 255, 12, 6, 0, 0, 0, 0, 0, 0, 106, 43, 55, 12, 255, 53, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
+#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 34, 26, 46, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 52, 1, 92, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 16, 0, 0, 0, 0, 0, 0, 0, 4, 255, 12, 6, 0, 0, 0, 0, 0, 0, 106, 43, 55, 12, 255, 53, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 86, 95, 224, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 249, 182, 0, 0, 0, 0, 0, 0, 0, 153, 16, 29, 162, 0, 0, 0, 0, 0, 0, 90, 95, 36, 23, 223, 88, 0, 0, 0, 0, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
+#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 240, 183, 130, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 86, 95, 224, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 249, 182, 0, 0, 0, 0, 0, 0, 0, 153, 16, 29, 162, 0, 0, 0, 0, 0, 0, 90, 95, 36, 23, 223, 88, 0, 0, 0, 0, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_CAM_SHUTTER, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGERED, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGER_CONTROL, MAVLINK_MESSAGE_INFO_IMAGE_AVAILABLE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_POSITION_CONTROL_OFFSET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT, MAVLINK_MESSAGE_INFO_MARKER, MAVLINK_MESSAGE_INFO_RAW_AUX, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_WATCHDOG_HEARTBEAT, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_INFO, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_STATUS, MAVLINK_MESSAGE_INFO_WATCHDOG_COMMAND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PATTERN_DETECTED, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST_CONNECTION, MAVLINK_MESSAGE_INFO_DATA_TRANSMISSION_HANDSHAKE, MAVLINK_MESSAGE_INFO_ENCAPSULATED_DATA, MAVLINK_MESSAGE_INFO_BRIEF_FEATURE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ATTITUDE_CONTROL, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
+#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_CAM_SHUTTER, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGERED, MAVLINK_MESSAGE_INFO_IMAGE_TRIGGER_CONTROL, MAVLINK_MESSAGE_INFO_IMAGE_AVAILABLE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_POSITION_CONTROL_OFFSET, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT, MAVLINK_MESSAGE_INFO_MARKER, MAVLINK_MESSAGE_INFO_RAW_AUX, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_WATCHDOG_HEARTBEAT, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_INFO, MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_STATUS, MAVLINK_MESSAGE_INFO_WATCHDOG_COMMAND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PATTERN_DETECTED, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST, MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST_CONNECTION, MAVLINK_MESSAGE_INFO_DATA_TRANSMISSION_HANDSHAKE, MAVLINK_MESSAGE_INFO_ENCAPSULATED_DATA, MAVLINK_MESSAGE_INFO_BRIEF_FEATURE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ATTITUDE_CONTROL, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
 #endif
 
 #include "../protocol.h"
 
 #define MAVLINK_ENABLED_PIXHAWK
 
-#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
 
 
@@ -100,6 +87,19 @@ enum MAV_CMD
 };
 #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_set_cam_shutter.h"
 #include "./mavlink_msg_image_triggered.h"
diff --git a/mavlink/include/mavlink/v1.0/pixhawk/version.h b/mavlink/include/mavlink/v1.0/pixhawk/version.h
index d571d1991..113cdd7a2 100644
--- a/mavlink/include/mavlink/v1.0/pixhawk/version.h
+++ b/mavlink/include/mavlink/v1.0/pixhawk/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sat Apr 28 19:24:08 2012"
+#define MAVLINK_BUILD_DATE "Thu Aug 23 16:39:39 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/mavlink/include/mavlink/v1.0/protocol.h b/mavlink/include/mavlink/v1.0/protocol.h
index 7b3e3c0bd..5283779d4 100644
--- a/mavlink/include/mavlink/v1.0/protocol.h
+++ b/mavlink/include/mavlink/v1.0/protocol.h
@@ -67,6 +67,7 @@ MAVLINK_HELPER uint8_t put_bitfield_n_by_index(int32_t b, uint8_t bits, uint8_t
 					       uint8_t* r_bit_index, uint8_t* buffer);
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len);
+MAVLINK_HELPER void _mavlink_resend_uart(mavlink_channel_t chan, const mavlink_message_t *msg);
 #endif
 
 /**
diff --git a/mavlink/include/mavlink/v1.0/sensesoar/sensesoar.h b/mavlink/include/mavlink/v1.0/sensesoar/sensesoar.h
index 5a6022d59..f4b096f9a 100644
--- a/mavlink/include/mavlink/v1.0/sensesoar/sensesoar.h
+++ b/mavlink/include/mavlink/v1.0/sensesoar/sensesoar.h
@@ -12,34 +12,21 @@ extern "C" {
 // MESSAGE LENGTHS AND CRCS
 
 #ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 12, 0, 32, 0, 12, 0, 12, 0, 24, 0, 4, 4, 12, 0, 12, 0, 20, 0, 4, 0, 5, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
+#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 34, 26, 46, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 12, 0, 32, 0, 12, 0, 12, 0, 24, 0, 4, 4, 12, 0, 12, 0, 20, 0, 4, 0, 5, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 108, 0, 146, 0, 16, 0, 32, 0, 159, 0, 24, 248, 79, 0, 5, 0, 170, 0, 157, 0, 209, 0, 243, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
+#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 240, 183, 130, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 108, 0, 146, 0, 16, 0, 32, 0, 159, 0, 24, 248, 79, 0, 5, 0, 170, 0, 157, 0, 209, 0, 243, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
 #endif
 
 #ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_POSITION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_VELOCITY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_ATTITUDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_WIND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_AIR_VELOCITY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_BIAS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_QFF, MAVLINK_MESSAGE_INFO_OBS_AIR_TEMP, MAVLINK_MESSAGE_INFO_FILT_ROT_VEL, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LLC_OUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PM_ELEC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SYS_Stat, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CMD_AIRSPEED_CHNG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CMD_AIRSPEED_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
+#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_LED_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_POSITION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_VELOCITY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_ATTITUDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_WIND, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_AIR_VELOCITY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_BIAS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OBS_QFF, MAVLINK_MESSAGE_INFO_OBS_AIR_TEMP, MAVLINK_MESSAGE_INFO_FILT_ROT_VEL, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LLC_OUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PM_ELEC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SYS_Stat, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CMD_AIRSPEED_CHNG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CMD_AIRSPEED_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
 #endif
 
 #include "../protocol.h"
 
 #define MAVLINK_ENABLED_SENSESOAR
 
-#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
 
 
@@ -55,6 +42,19 @@ enum SENSESOAR_MODE
 };
 #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_obs_position.h"
 #include "./mavlink_msg_obs_velocity.h"
diff --git a/mavlink/include/mavlink/v1.0/sensesoar/version.h b/mavlink/include/mavlink/v1.0/sensesoar/version.h
index f2a254a51..bf3e56247 100644
--- a/mavlink/include/mavlink/v1.0/sensesoar/version.h
+++ b/mavlink/include/mavlink/v1.0/sensesoar/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:51 2012"
+#define MAVLINK_BUILD_DATE "Thu Aug 23 16:39:49 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink.h b/mavlink/include/mavlink/v1.0/slugs/mavlink.h
deleted file mode 100644
index d28bbc7b9..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from slugs.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 254
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_LITTLE_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 1
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 1
-#endif
-
-#include "version.h"
-#include "slugs.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_air_data.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_air_data.h
deleted file mode 100644
index 4b02f6dcf..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_air_data.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE AIR_DATA PACKING
-
-#define MAVLINK_MSG_ID_AIR_DATA 171
-
-typedef struct __mavlink_air_data_t
-{
- float dynamicPressure; ///< Dynamic pressure (Pa)
- float staticPressure; ///< Static pressure (Pa)
- uint16_t temperature; ///< Board temperature
-} mavlink_air_data_t;
-
-#define MAVLINK_MSG_ID_AIR_DATA_LEN 10
-#define MAVLINK_MSG_ID_171_LEN 10
-
-
-
-#define MAVLINK_MESSAGE_INFO_AIR_DATA { \
-	"AIR_DATA", \
-	3, \
-	{  { "dynamicPressure", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_air_data_t, dynamicPressure) }, \
-         { "staticPressure", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_air_data_t, staticPressure) }, \
-         { "temperature", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_air_data_t, temperature) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a air_data message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_air_data_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float dynamicPressure, float staticPressure, uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 10);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AIR_DATA;
-	return mavlink_finalize_message(msg, system_id, component_id, 10, 232);
-}
-
-/**
- * @brief Pack a air_data message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_air_data_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float dynamicPressure,float staticPressure,uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 10);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_AIR_DATA;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 10, 232);
-}
-
-/**
- * @brief Encode a air_data struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param air_data C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_air_data_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_air_data_t* air_data)
-{
-	return mavlink_msg_air_data_pack(system_id, component_id, msg, air_data->dynamicPressure, air_data->staticPressure, air_data->temperature);
-}
-
-/**
- * @brief Send a air_data message
- * @param chan MAVLink channel to send the message
- *
- * @param dynamicPressure Dynamic pressure (Pa)
- * @param staticPressure Static pressure (Pa)
- * @param temperature Board temperature
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_air_data_send(mavlink_channel_t chan, float dynamicPressure, float staticPressure, uint16_t temperature)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, dynamicPressure);
-	_mav_put_float(buf, 4, staticPressure);
-	_mav_put_uint16_t(buf, 8, temperature);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AIR_DATA, buf, 10, 232);
-#else
-	mavlink_air_data_t packet;
-	packet.dynamicPressure = dynamicPressure;
-	packet.staticPressure = staticPressure;
-	packet.temperature = temperature;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_AIR_DATA, (const char *)&packet, 10, 232);
-#endif
-}
-
-#endif
-
-// MESSAGE AIR_DATA UNPACKING
-
-
-/**
- * @brief Get field dynamicPressure from air_data message
- *
- * @return Dynamic pressure (Pa)
- */
-static inline float mavlink_msg_air_data_get_dynamicPressure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field staticPressure from air_data message
- *
- * @return Static pressure (Pa)
- */
-static inline float mavlink_msg_air_data_get_staticPressure(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field temperature from air_data message
- *
- * @return Board temperature
- */
-static inline uint16_t mavlink_msg_air_data_get_temperature(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  8);
-}
-
-/**
- * @brief Decode a air_data message into a struct
- *
- * @param msg The message to decode
- * @param air_data C-struct to decode the message contents into
- */
-static inline void mavlink_msg_air_data_decode(const mavlink_message_t* msg, mavlink_air_data_t* air_data)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	air_data->dynamicPressure = mavlink_msg_air_data_get_dynamicPressure(msg);
-	air_data->staticPressure = mavlink_msg_air_data_get_staticPressure(msg);
-	air_data->temperature = mavlink_msg_air_data_get_temperature(msg);
-#else
-	memcpy(air_data, _MAV_PAYLOAD(msg), 10);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_cpu_load.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_cpu_load.h
deleted file mode 100644
index 5f86c7091..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_cpu_load.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE CPU_LOAD PACKING
-
-#define MAVLINK_MSG_ID_CPU_LOAD 170
-
-typedef struct __mavlink_cpu_load_t
-{
- uint16_t batVolt; ///< Battery Voltage in millivolts
- uint8_t sensLoad; ///< Sensor DSC Load
- uint8_t ctrlLoad; ///< Control DSC Load
-} mavlink_cpu_load_t;
-
-#define MAVLINK_MSG_ID_CPU_LOAD_LEN 4
-#define MAVLINK_MSG_ID_170_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_CPU_LOAD { \
-	"CPU_LOAD", \
-	3, \
-	{  { "batVolt", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_cpu_load_t, batVolt) }, \
-         { "sensLoad", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_cpu_load_t, sensLoad) }, \
-         { "ctrlLoad", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_cpu_load_t, ctrlLoad) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a cpu_load message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_cpu_load_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t sensLoad, uint8_t ctrlLoad, uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, batVolt);
-	_mav_put_uint8_t(buf, 2, sensLoad);
-	_mav_put_uint8_t(buf, 3, ctrlLoad);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_cpu_load_t packet;
-	packet.batVolt = batVolt;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CPU_LOAD;
-	return mavlink_finalize_message(msg, system_id, component_id, 4, 75);
-}
-
-/**
- * @brief Pack a cpu_load message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_cpu_load_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t sensLoad,uint8_t ctrlLoad,uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, batVolt);
-	_mav_put_uint8_t(buf, 2, sensLoad);
-	_mav_put_uint8_t(buf, 3, ctrlLoad);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_cpu_load_t packet;
-	packet.batVolt = batVolt;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CPU_LOAD;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4, 75);
-}
-
-/**
- * @brief Encode a cpu_load struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param cpu_load C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_cpu_load_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_cpu_load_t* cpu_load)
-{
-	return mavlink_msg_cpu_load_pack(system_id, component_id, msg, cpu_load->sensLoad, cpu_load->ctrlLoad, cpu_load->batVolt);
-}
-
-/**
- * @brief Send a cpu_load message
- * @param chan MAVLink channel to send the message
- *
- * @param sensLoad Sensor DSC Load
- * @param ctrlLoad Control DSC Load
- * @param batVolt Battery Voltage in millivolts
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_cpu_load_send(mavlink_channel_t chan, uint8_t sensLoad, uint8_t ctrlLoad, uint16_t batVolt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, batVolt);
-	_mav_put_uint8_t(buf, 2, sensLoad);
-	_mav_put_uint8_t(buf, 3, ctrlLoad);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CPU_LOAD, buf, 4, 75);
-#else
-	mavlink_cpu_load_t packet;
-	packet.batVolt = batVolt;
-	packet.sensLoad = sensLoad;
-	packet.ctrlLoad = ctrlLoad;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CPU_LOAD, (const char *)&packet, 4, 75);
-#endif
-}
-
-#endif
-
-// MESSAGE CPU_LOAD UNPACKING
-
-
-/**
- * @brief Get field sensLoad from cpu_load message
- *
- * @return Sensor DSC Load
- */
-static inline uint8_t mavlink_msg_cpu_load_get_sensLoad(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field ctrlLoad from cpu_load message
- *
- * @return Control DSC Load
- */
-static inline uint8_t mavlink_msg_cpu_load_get_ctrlLoad(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field batVolt from cpu_load message
- *
- * @return Battery Voltage in millivolts
- */
-static inline uint16_t mavlink_msg_cpu_load_get_batVolt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Decode a cpu_load message into a struct
- *
- * @param msg The message to decode
- * @param cpu_load C-struct to decode the message contents into
- */
-static inline void mavlink_msg_cpu_load_decode(const mavlink_message_t* msg, mavlink_cpu_load_t* cpu_load)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	cpu_load->batVolt = mavlink_msg_cpu_load_get_batVolt(msg);
-	cpu_load->sensLoad = mavlink_msg_cpu_load_get_sensLoad(msg);
-	cpu_load->ctrlLoad = mavlink_msg_cpu_load_get_ctrlLoad(msg);
-#else
-	memcpy(cpu_load, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_ctrl_srfc_pt.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_ctrl_srfc_pt.h
deleted file mode 100644
index e506ed18f..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_ctrl_srfc_pt.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// MESSAGE CTRL_SRFC_PT PACKING
-
-#define MAVLINK_MSG_ID_CTRL_SRFC_PT 181
-
-typedef struct __mavlink_ctrl_srfc_pt_t
-{
- uint16_t bitfieldPt; ///< Bitfield containing the PT configuration
- uint8_t target; ///< The system setting the commands
-} mavlink_ctrl_srfc_pt_t;
-
-#define MAVLINK_MSG_ID_CTRL_SRFC_PT_LEN 3
-#define MAVLINK_MSG_ID_181_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_CTRL_SRFC_PT { \
-	"CTRL_SRFC_PT", \
-	2, \
-	{  { "bitfieldPt", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_ctrl_srfc_pt_t, bitfieldPt) }, \
-         { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_ctrl_srfc_pt_t, target) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ctrl_srfc_pt message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, bitfieldPt);
-	_mav_put_uint8_t(buf, 2, target);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.bitfieldPt = bitfieldPt;
-	packet.target = target;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CTRL_SRFC_PT;
-	return mavlink_finalize_message(msg, system_id, component_id, 3, 104);
-}
-
-/**
- * @brief Pack a ctrl_srfc_pt message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, bitfieldPt);
-	_mav_put_uint8_t(buf, 2, target);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.bitfieldPt = bitfieldPt;
-	packet.target = target;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CTRL_SRFC_PT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3, 104);
-}
-
-/**
- * @brief Encode a ctrl_srfc_pt struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ctrl_srfc_pt C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ctrl_srfc_pt_t* ctrl_srfc_pt)
-{
-	return mavlink_msg_ctrl_srfc_pt_pack(system_id, component_id, msg, ctrl_srfc_pt->target, ctrl_srfc_pt->bitfieldPt);
-}
-
-/**
- * @brief Send a ctrl_srfc_pt message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the commands
- * @param bitfieldPt Bitfield containing the PT configuration
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ctrl_srfc_pt_send(mavlink_channel_t chan, uint8_t target, uint16_t bitfieldPt)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint16_t(buf, 0, bitfieldPt);
-	_mav_put_uint8_t(buf, 2, target);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CTRL_SRFC_PT, buf, 3, 104);
-#else
-	mavlink_ctrl_srfc_pt_t packet;
-	packet.bitfieldPt = bitfieldPt;
-	packet.target = target;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CTRL_SRFC_PT, (const char *)&packet, 3, 104);
-#endif
-}
-
-#endif
-
-// MESSAGE CTRL_SRFC_PT UNPACKING
-
-
-/**
- * @brief Get field target from ctrl_srfc_pt message
- *
- * @return The system setting the commands
- */
-static inline uint8_t mavlink_msg_ctrl_srfc_pt_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field bitfieldPt from ctrl_srfc_pt message
- *
- * @return Bitfield containing the PT configuration
- */
-static inline uint16_t mavlink_msg_ctrl_srfc_pt_get_bitfieldPt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Decode a ctrl_srfc_pt message into a struct
- *
- * @param msg The message to decode
- * @param ctrl_srfc_pt C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ctrl_srfc_pt_decode(const mavlink_message_t* msg, mavlink_ctrl_srfc_pt_t* ctrl_srfc_pt)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ctrl_srfc_pt->bitfieldPt = mavlink_msg_ctrl_srfc_pt_get_bitfieldPt(msg);
-	ctrl_srfc_pt->target = mavlink_msg_ctrl_srfc_pt_get_target(msg);
-#else
-	memcpy(ctrl_srfc_pt, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_data_log.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_data_log.h
deleted file mode 100644
index 49e340704..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_data_log.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE DATA_LOG PACKING
-
-#define MAVLINK_MSG_ID_DATA_LOG 177
-
-typedef struct __mavlink_data_log_t
-{
- float fl_1; ///< Log value 1 
- float fl_2; ///< Log value 2 
- float fl_3; ///< Log value 3 
- float fl_4; ///< Log value 4 
- float fl_5; ///< Log value 5 
- float fl_6; ///< Log value 6 
-} mavlink_data_log_t;
-
-#define MAVLINK_MSG_ID_DATA_LOG_LEN 24
-#define MAVLINK_MSG_ID_177_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_DATA_LOG { \
-	"DATA_LOG", \
-	6, \
-	{  { "fl_1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_data_log_t, fl_1) }, \
-         { "fl_2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_data_log_t, fl_2) }, \
-         { "fl_3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_data_log_t, fl_3) }, \
-         { "fl_4", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_data_log_t, fl_4) }, \
-         { "fl_5", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_data_log_t, fl_5) }, \
-         { "fl_6", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_data_log_t, fl_6) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a data_log message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_log_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float fl_1, float fl_2, float fl_3, float fl_4, float fl_5, float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_LOG;
-	return mavlink_finalize_message(msg, system_id, component_id, 24, 167);
-}
-
-/**
- * @brief Pack a data_log message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_data_log_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float fl_1,float fl_2,float fl_3,float fl_4,float fl_5,float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DATA_LOG;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24, 167);
-}
-
-/**
- * @brief Encode a data_log struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param data_log C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_data_log_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_data_log_t* data_log)
-{
-	return mavlink_msg_data_log_pack(system_id, component_id, msg, data_log->fl_1, data_log->fl_2, data_log->fl_3, data_log->fl_4, data_log->fl_5, data_log->fl_6);
-}
-
-/**
- * @brief Send a data_log message
- * @param chan MAVLink channel to send the message
- *
- * @param fl_1 Log value 1 
- * @param fl_2 Log value 2 
- * @param fl_3 Log value 3 
- * @param fl_4 Log value 4 
- * @param fl_5 Log value 5 
- * @param fl_6 Log value 6 
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_data_log_send(mavlink_channel_t chan, float fl_1, float fl_2, float fl_3, float fl_4, float fl_5, float fl_6)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, fl_1);
-	_mav_put_float(buf, 4, fl_2);
-	_mav_put_float(buf, 8, fl_3);
-	_mav_put_float(buf, 12, fl_4);
-	_mav_put_float(buf, 16, fl_5);
-	_mav_put_float(buf, 20, fl_6);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_LOG, buf, 24, 167);
-#else
-	mavlink_data_log_t packet;
-	packet.fl_1 = fl_1;
-	packet.fl_2 = fl_2;
-	packet.fl_3 = fl_3;
-	packet.fl_4 = fl_4;
-	packet.fl_5 = fl_5;
-	packet.fl_6 = fl_6;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DATA_LOG, (const char *)&packet, 24, 167);
-#endif
-}
-
-#endif
-
-// MESSAGE DATA_LOG UNPACKING
-
-
-/**
- * @brief Get field fl_1 from data_log message
- *
- * @return Log value 1 
- */
-static inline float mavlink_msg_data_log_get_fl_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field fl_2 from data_log message
- *
- * @return Log value 2 
- */
-static inline float mavlink_msg_data_log_get_fl_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field fl_3 from data_log message
- *
- * @return Log value 3 
- */
-static inline float mavlink_msg_data_log_get_fl_3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field fl_4 from data_log message
- *
- * @return Log value 4 
- */
-static inline float mavlink_msg_data_log_get_fl_4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field fl_5 from data_log message
- *
- * @return Log value 5 
- */
-static inline float mavlink_msg_data_log_get_fl_5(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field fl_6 from data_log message
- *
- * @return Log value 6 
- */
-static inline float mavlink_msg_data_log_get_fl_6(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a data_log message into a struct
- *
- * @param msg The message to decode
- * @param data_log C-struct to decode the message contents into
- */
-static inline void mavlink_msg_data_log_decode(const mavlink_message_t* msg, mavlink_data_log_t* data_log)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	data_log->fl_1 = mavlink_msg_data_log_get_fl_1(msg);
-	data_log->fl_2 = mavlink_msg_data_log_get_fl_2(msg);
-	data_log->fl_3 = mavlink_msg_data_log_get_fl_3(msg);
-	data_log->fl_4 = mavlink_msg_data_log_get_fl_4(msg);
-	data_log->fl_5 = mavlink_msg_data_log_get_fl_5(msg);
-	data_log->fl_6 = mavlink_msg_data_log_get_fl_6(msg);
-#else
-	memcpy(data_log, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_diagnostic.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_diagnostic.h
deleted file mode 100644
index ef77e5f08..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_diagnostic.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE DIAGNOSTIC PACKING
-
-#define MAVLINK_MSG_ID_DIAGNOSTIC 173
-
-typedef struct __mavlink_diagnostic_t
-{
- float diagFl1; ///< Diagnostic float 1
- float diagFl2; ///< Diagnostic float 2
- float diagFl3; ///< Diagnostic float 3
- int16_t diagSh1; ///< Diagnostic short 1
- int16_t diagSh2; ///< Diagnostic short 2
- int16_t diagSh3; ///< Diagnostic short 3
-} mavlink_diagnostic_t;
-
-#define MAVLINK_MSG_ID_DIAGNOSTIC_LEN 18
-#define MAVLINK_MSG_ID_173_LEN 18
-
-
-
-#define MAVLINK_MESSAGE_INFO_DIAGNOSTIC { \
-	"DIAGNOSTIC", \
-	6, \
-	{  { "diagFl1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_diagnostic_t, diagFl1) }, \
-         { "diagFl2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_diagnostic_t, diagFl2) }, \
-         { "diagFl3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_diagnostic_t, diagFl3) }, \
-         { "diagSh1", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_diagnostic_t, diagSh1) }, \
-         { "diagSh2", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_diagnostic_t, diagSh2) }, \
-         { "diagSh3", NULL, MAVLINK_TYPE_INT16_T, 0, 16, offsetof(mavlink_diagnostic_t, diagSh3) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a diagnostic message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_diagnostic_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float diagFl1, float diagFl2, float diagFl3, int16_t diagSh1, int16_t diagSh2, int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIAGNOSTIC;
-	return mavlink_finalize_message(msg, system_id, component_id, 18, 2);
-}
-
-/**
- * @brief Pack a diagnostic message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_diagnostic_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float diagFl1,float diagFl2,float diagFl3,int16_t diagSh1,int16_t diagSh2,int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_DIAGNOSTIC;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18, 2);
-}
-
-/**
- * @brief Encode a diagnostic struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param diagnostic C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_diagnostic_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_diagnostic_t* diagnostic)
-{
-	return mavlink_msg_diagnostic_pack(system_id, component_id, msg, diagnostic->diagFl1, diagnostic->diagFl2, diagnostic->diagFl3, diagnostic->diagSh1, diagnostic->diagSh2, diagnostic->diagSh3);
-}
-
-/**
- * @brief Send a diagnostic message
- * @param chan MAVLink channel to send the message
- *
- * @param diagFl1 Diagnostic float 1
- * @param diagFl2 Diagnostic float 2
- * @param diagFl3 Diagnostic float 3
- * @param diagSh1 Diagnostic short 1
- * @param diagSh2 Diagnostic short 2
- * @param diagSh3 Diagnostic short 3
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_diagnostic_send(mavlink_channel_t chan, float diagFl1, float diagFl2, float diagFl3, int16_t diagSh1, int16_t diagSh2, int16_t diagSh3)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[18];
-	_mav_put_float(buf, 0, diagFl1);
-	_mav_put_float(buf, 4, diagFl2);
-	_mav_put_float(buf, 8, diagFl3);
-	_mav_put_int16_t(buf, 12, diagSh1);
-	_mav_put_int16_t(buf, 14, diagSh2);
-	_mav_put_int16_t(buf, 16, diagSh3);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIAGNOSTIC, buf, 18, 2);
-#else
-	mavlink_diagnostic_t packet;
-	packet.diagFl1 = diagFl1;
-	packet.diagFl2 = diagFl2;
-	packet.diagFl3 = diagFl3;
-	packet.diagSh1 = diagSh1;
-	packet.diagSh2 = diagSh2;
-	packet.diagSh3 = diagSh3;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DIAGNOSTIC, (const char *)&packet, 18, 2);
-#endif
-}
-
-#endif
-
-// MESSAGE DIAGNOSTIC UNPACKING
-
-
-/**
- * @brief Get field diagFl1 from diagnostic message
- *
- * @return Diagnostic float 1
- */
-static inline float mavlink_msg_diagnostic_get_diagFl1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field diagFl2 from diagnostic message
- *
- * @return Diagnostic float 2
- */
-static inline float mavlink_msg_diagnostic_get_diagFl2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field diagFl3 from diagnostic message
- *
- * @return Diagnostic float 3
- */
-static inline float mavlink_msg_diagnostic_get_diagFl3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field diagSh1 from diagnostic message
- *
- * @return Diagnostic short 1
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  12);
-}
-
-/**
- * @brief Get field diagSh2 from diagnostic message
- *
- * @return Diagnostic short 2
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  14);
-}
-
-/**
- * @brief Get field diagSh3 from diagnostic message
- *
- * @return Diagnostic short 3
- */
-static inline int16_t mavlink_msg_diagnostic_get_diagSh3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  16);
-}
-
-/**
- * @brief Decode a diagnostic message into a struct
- *
- * @param msg The message to decode
- * @param diagnostic C-struct to decode the message contents into
- */
-static inline void mavlink_msg_diagnostic_decode(const mavlink_message_t* msg, mavlink_diagnostic_t* diagnostic)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	diagnostic->diagFl1 = mavlink_msg_diagnostic_get_diagFl1(msg);
-	diagnostic->diagFl2 = mavlink_msg_diagnostic_get_diagFl2(msg);
-	diagnostic->diagFl3 = mavlink_msg_diagnostic_get_diagFl3(msg);
-	diagnostic->diagSh1 = mavlink_msg_diagnostic_get_diagSh1(msg);
-	diagnostic->diagSh2 = mavlink_msg_diagnostic_get_diagSh2(msg);
-	diagnostic->diagSh3 = mavlink_msg_diagnostic_get_diagSh3(msg);
-#else
-	memcpy(diagnostic, _MAV_PAYLOAD(msg), 18);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_gps_date_time.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_gps_date_time.h
deleted file mode 100644
index 62b33d475..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_gps_date_time.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE GPS_DATE_TIME PACKING
-
-#define MAVLINK_MSG_ID_GPS_DATE_TIME 179
-
-typedef struct __mavlink_gps_date_time_t
-{
- uint8_t year; ///< Year reported by Gps 
- uint8_t month; ///< Month reported by Gps 
- uint8_t day; ///< Day reported by Gps 
- uint8_t hour; ///< Hour reported by Gps 
- uint8_t min; ///< Min reported by Gps 
- uint8_t sec; ///< Sec reported by Gps  
- uint8_t visSat; ///< Visible sattelites reported by Gps  
-} mavlink_gps_date_time_t;
-
-#define MAVLINK_MSG_ID_GPS_DATE_TIME_LEN 7
-#define MAVLINK_MSG_ID_179_LEN 7
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_DATE_TIME { \
-	"GPS_DATE_TIME", \
-	7, \
-	{  { "year", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_gps_date_time_t, year) }, \
-         { "month", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_gps_date_time_t, month) }, \
-         { "day", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_gps_date_time_t, day) }, \
-         { "hour", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_gps_date_time_t, hour) }, \
-         { "min", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_gps_date_time_t, min) }, \
-         { "sec", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_gps_date_time_t, sec) }, \
-         { "visSat", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_gps_date_time_t, visSat) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_date_time message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_date_time_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t min, uint8_t sec, uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 7);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 7);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_DATE_TIME;
-	return mavlink_finalize_message(msg, system_id, component_id, 7, 16);
-}
-
-/**
- * @brief Pack a gps_date_time message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_date_time_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t year,uint8_t month,uint8_t day,uint8_t hour,uint8_t min,uint8_t sec,uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 7);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 7);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_DATE_TIME;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 7, 16);
-}
-
-/**
- * @brief Encode a gps_date_time struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_date_time C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_date_time_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_date_time_t* gps_date_time)
-{
-	return mavlink_msg_gps_date_time_pack(system_id, component_id, msg, gps_date_time->year, gps_date_time->month, gps_date_time->day, gps_date_time->hour, gps_date_time->min, gps_date_time->sec, gps_date_time->visSat);
-}
-
-/**
- * @brief Send a gps_date_time message
- * @param chan MAVLink channel to send the message
- *
- * @param year Year reported by Gps 
- * @param month Month reported by Gps 
- * @param day Day reported by Gps 
- * @param hour Hour reported by Gps 
- * @param min Min reported by Gps 
- * @param sec Sec reported by Gps  
- * @param visSat Visible sattelites reported by Gps  
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_date_time_send(mavlink_channel_t chan, uint8_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t min, uint8_t sec, uint8_t visSat)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[7];
-	_mav_put_uint8_t(buf, 0, year);
-	_mav_put_uint8_t(buf, 1, month);
-	_mav_put_uint8_t(buf, 2, day);
-	_mav_put_uint8_t(buf, 3, hour);
-	_mav_put_uint8_t(buf, 4, min);
-	_mav_put_uint8_t(buf, 5, sec);
-	_mav_put_uint8_t(buf, 6, visSat);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_DATE_TIME, buf, 7, 16);
-#else
-	mavlink_gps_date_time_t packet;
-	packet.year = year;
-	packet.month = month;
-	packet.day = day;
-	packet.hour = hour;
-	packet.min = min;
-	packet.sec = sec;
-	packet.visSat = visSat;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_DATE_TIME, (const char *)&packet, 7, 16);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_DATE_TIME UNPACKING
-
-
-/**
- * @brief Get field year from gps_date_time message
- *
- * @return Year reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_year(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field month from gps_date_time message
- *
- * @return Month reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_month(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field day from gps_date_time message
- *
- * @return Day reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_day(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field hour from gps_date_time message
- *
- * @return Hour reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_hour(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field min from gps_date_time message
- *
- * @return Min reported by Gps 
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_min(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field sec from gps_date_time message
- *
- * @return Sec reported by Gps  
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_sec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field visSat from gps_date_time message
- *
- * @return Visible sattelites reported by Gps  
- */
-static inline uint8_t mavlink_msg_gps_date_time_get_visSat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Decode a gps_date_time message into a struct
- *
- * @param msg The message to decode
- * @param gps_date_time C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_date_time_decode(const mavlink_message_t* msg, mavlink_gps_date_time_t* gps_date_time)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_date_time->year = mavlink_msg_gps_date_time_get_year(msg);
-	gps_date_time->month = mavlink_msg_gps_date_time_get_month(msg);
-	gps_date_time->day = mavlink_msg_gps_date_time_get_day(msg);
-	gps_date_time->hour = mavlink_msg_gps_date_time_get_hour(msg);
-	gps_date_time->min = mavlink_msg_gps_date_time_get_min(msg);
-	gps_date_time->sec = mavlink_msg_gps_date_time_get_sec(msg);
-	gps_date_time->visSat = mavlink_msg_gps_date_time_get_visSat(msg);
-#else
-	memcpy(gps_date_time, _MAV_PAYLOAD(msg), 7);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_mid_lvl_cmds.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_mid_lvl_cmds.h
deleted file mode 100644
index 6542ab1de..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_mid_lvl_cmds.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// MESSAGE MID_LVL_CMDS PACKING
-
-#define MAVLINK_MSG_ID_MID_LVL_CMDS 180
-
-typedef struct __mavlink_mid_lvl_cmds_t
-{
- float hCommand; ///< Commanded Airspeed
- float uCommand; ///< Log value 2 
- float rCommand; ///< Log value 3 
- uint8_t target; ///< The system setting the commands
-} mavlink_mid_lvl_cmds_t;
-
-#define MAVLINK_MSG_ID_MID_LVL_CMDS_LEN 13
-#define MAVLINK_MSG_ID_180_LEN 13
-
-
-
-#define MAVLINK_MESSAGE_INFO_MID_LVL_CMDS { \
-	"MID_LVL_CMDS", \
-	4, \
-	{  { "hCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_mid_lvl_cmds_t, hCommand) }, \
-         { "uCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_mid_lvl_cmds_t, uCommand) }, \
-         { "rCommand", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_mid_lvl_cmds_t, rCommand) }, \
-         { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_mid_lvl_cmds_t, target) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a mid_lvl_cmds message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, float hCommand, float uCommand, float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_float(buf, 0, hCommand);
-	_mav_put_float(buf, 4, uCommand);
-	_mav_put_float(buf, 8, rCommand);
-	_mav_put_uint8_t(buf, 12, target);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-	packet.target = target;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MID_LVL_CMDS;
-	return mavlink_finalize_message(msg, system_id, component_id, 13, 146);
-}
-
-/**
- * @brief Pack a mid_lvl_cmds message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,float hCommand,float uCommand,float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_float(buf, 0, hCommand);
-	_mav_put_float(buf, 4, uCommand);
-	_mav_put_float(buf, 8, rCommand);
-	_mav_put_uint8_t(buf, 12, target);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 13);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-	packet.target = target;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 13);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_MID_LVL_CMDS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 13, 146);
-}
-
-/**
- * @brief Encode a mid_lvl_cmds struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param mid_lvl_cmds C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_mid_lvl_cmds_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_mid_lvl_cmds_t* mid_lvl_cmds)
-{
-	return mavlink_msg_mid_lvl_cmds_pack(system_id, component_id, msg, mid_lvl_cmds->target, mid_lvl_cmds->hCommand, mid_lvl_cmds->uCommand, mid_lvl_cmds->rCommand);
-}
-
-/**
- * @brief Send a mid_lvl_cmds message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system setting the commands
- * @param hCommand Commanded Airspeed
- * @param uCommand Log value 2 
- * @param rCommand Log value 3 
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_mid_lvl_cmds_send(mavlink_channel_t chan, uint8_t target, float hCommand, float uCommand, float rCommand)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[13];
-	_mav_put_float(buf, 0, hCommand);
-	_mav_put_float(buf, 4, uCommand);
-	_mav_put_float(buf, 8, rCommand);
-	_mav_put_uint8_t(buf, 12, target);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MID_LVL_CMDS, buf, 13, 146);
-#else
-	mavlink_mid_lvl_cmds_t packet;
-	packet.hCommand = hCommand;
-	packet.uCommand = uCommand;
-	packet.rCommand = rCommand;
-	packet.target = target;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MID_LVL_CMDS, (const char *)&packet, 13, 146);
-#endif
-}
-
-#endif
-
-// MESSAGE MID_LVL_CMDS UNPACKING
-
-
-/**
- * @brief Get field target from mid_lvl_cmds message
- *
- * @return The system setting the commands
- */
-static inline uint8_t mavlink_msg_mid_lvl_cmds_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  12);
-}
-
-/**
- * @brief Get field hCommand from mid_lvl_cmds message
- *
- * @return Commanded Airspeed
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_hCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field uCommand from mid_lvl_cmds message
- *
- * @return Log value 2 
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_uCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field rCommand from mid_lvl_cmds message
- *
- * @return Log value 3 
- */
-static inline float mavlink_msg_mid_lvl_cmds_get_rCommand(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Decode a mid_lvl_cmds message into a struct
- *
- * @param msg The message to decode
- * @param mid_lvl_cmds C-struct to decode the message contents into
- */
-static inline void mavlink_msg_mid_lvl_cmds_decode(const mavlink_message_t* msg, mavlink_mid_lvl_cmds_t* mid_lvl_cmds)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mid_lvl_cmds->hCommand = mavlink_msg_mid_lvl_cmds_get_hCommand(msg);
-	mid_lvl_cmds->uCommand = mavlink_msg_mid_lvl_cmds_get_uCommand(msg);
-	mid_lvl_cmds->rCommand = mavlink_msg_mid_lvl_cmds_get_rCommand(msg);
-	mid_lvl_cmds->target = mavlink_msg_mid_lvl_cmds_get_target(msg);
-#else
-	memcpy(mid_lvl_cmds, _MAV_PAYLOAD(msg), 13);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_sensor_bias.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_sensor_bias.h
deleted file mode 100644
index 7dec47ed3..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_sensor_bias.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// MESSAGE SENSOR_BIAS PACKING
-
-#define MAVLINK_MSG_ID_SENSOR_BIAS 172
-
-typedef struct __mavlink_sensor_bias_t
-{
- float axBias; ///< Accelerometer X bias (m/s)
- float ayBias; ///< Accelerometer Y bias (m/s)
- float azBias; ///< Accelerometer Z bias (m/s)
- float gxBias; ///< Gyro X bias (rad/s)
- float gyBias; ///< Gyro Y bias (rad/s)
- float gzBias; ///< Gyro Z bias (rad/s)
-} mavlink_sensor_bias_t;
-
-#define MAVLINK_MSG_ID_SENSOR_BIAS_LEN 24
-#define MAVLINK_MSG_ID_172_LEN 24
-
-
-
-#define MAVLINK_MESSAGE_INFO_SENSOR_BIAS { \
-	"SENSOR_BIAS", \
-	6, \
-	{  { "axBias", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_sensor_bias_t, axBias) }, \
-         { "ayBias", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_sensor_bias_t, ayBias) }, \
-         { "azBias", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_sensor_bias_t, azBias) }, \
-         { "gxBias", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_sensor_bias_t, gxBias) }, \
-         { "gyBias", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_sensor_bias_t, gyBias) }, \
-         { "gzBias", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_sensor_bias_t, gzBias) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a sensor_bias message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_bias_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float axBias, float ayBias, float azBias, float gxBias, float gyBias, float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_BIAS;
-	return mavlink_finalize_message(msg, system_id, component_id, 24, 168);
-}
-
-/**
- * @brief Pack a sensor_bias message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_sensor_bias_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float axBias,float ayBias,float azBias,float gxBias,float gyBias,float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 24);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 24);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SENSOR_BIAS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 24, 168);
-}
-
-/**
- * @brief Encode a sensor_bias struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param sensor_bias C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_sensor_bias_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_sensor_bias_t* sensor_bias)
-{
-	return mavlink_msg_sensor_bias_pack(system_id, component_id, msg, sensor_bias->axBias, sensor_bias->ayBias, sensor_bias->azBias, sensor_bias->gxBias, sensor_bias->gyBias, sensor_bias->gzBias);
-}
-
-/**
- * @brief Send a sensor_bias message
- * @param chan MAVLink channel to send the message
- *
- * @param axBias Accelerometer X bias (m/s)
- * @param ayBias Accelerometer Y bias (m/s)
- * @param azBias Accelerometer Z bias (m/s)
- * @param gxBias Gyro X bias (rad/s)
- * @param gyBias Gyro Y bias (rad/s)
- * @param gzBias Gyro Z bias (rad/s)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_sensor_bias_send(mavlink_channel_t chan, float axBias, float ayBias, float azBias, float gxBias, float gyBias, float gzBias)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[24];
-	_mav_put_float(buf, 0, axBias);
-	_mav_put_float(buf, 4, ayBias);
-	_mav_put_float(buf, 8, azBias);
-	_mav_put_float(buf, 12, gxBias);
-	_mav_put_float(buf, 16, gyBias);
-	_mav_put_float(buf, 20, gzBias);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_BIAS, buf, 24, 168);
-#else
-	mavlink_sensor_bias_t packet;
-	packet.axBias = axBias;
-	packet.ayBias = ayBias;
-	packet.azBias = azBias;
-	packet.gxBias = gxBias;
-	packet.gyBias = gyBias;
-	packet.gzBias = gzBias;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SENSOR_BIAS, (const char *)&packet, 24, 168);
-#endif
-}
-
-#endif
-
-// MESSAGE SENSOR_BIAS UNPACKING
-
-
-/**
- * @brief Get field axBias from sensor_bias message
- *
- * @return Accelerometer X bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_axBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field ayBias from sensor_bias message
- *
- * @return Accelerometer Y bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_ayBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field azBias from sensor_bias message
- *
- * @return Accelerometer Z bias (m/s)
- */
-static inline float mavlink_msg_sensor_bias_get_azBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field gxBias from sensor_bias message
- *
- * @return Gyro X bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gxBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field gyBias from sensor_bias message
- *
- * @return Gyro Y bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gyBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field gzBias from sensor_bias message
- *
- * @return Gyro Z bias (rad/s)
- */
-static inline float mavlink_msg_sensor_bias_get_gzBias(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Decode a sensor_bias message into a struct
- *
- * @param msg The message to decode
- * @param sensor_bias C-struct to decode the message contents into
- */
-static inline void mavlink_msg_sensor_bias_decode(const mavlink_message_t* msg, mavlink_sensor_bias_t* sensor_bias)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	sensor_bias->axBias = mavlink_msg_sensor_bias_get_axBias(msg);
-	sensor_bias->ayBias = mavlink_msg_sensor_bias_get_ayBias(msg);
-	sensor_bias->azBias = mavlink_msg_sensor_bias_get_azBias(msg);
-	sensor_bias->gxBias = mavlink_msg_sensor_bias_get_gxBias(msg);
-	sensor_bias->gyBias = mavlink_msg_sensor_bias_get_gyBias(msg);
-	sensor_bias->gzBias = mavlink_msg_sensor_bias_get_gzBias(msg);
-#else
-	memcpy(sensor_bias, _MAV_PAYLOAD(msg), 24);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_action.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_action.h
deleted file mode 100644
index 84b87a308..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_action.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE SLUGS_ACTION PACKING
-
-#define MAVLINK_MSG_ID_SLUGS_ACTION 183
-
-typedef struct __mavlink_slugs_action_t
-{
- uint16_t actionVal; ///< Value associated with the action
- uint8_t target; ///< The system reporting the action
- uint8_t actionId; ///< Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
-} mavlink_slugs_action_t;
-
-#define MAVLINK_MSG_ID_SLUGS_ACTION_LEN 4
-#define MAVLINK_MSG_ID_183_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_SLUGS_ACTION { \
-	"SLUGS_ACTION", \
-	3, \
-	{  { "actionVal", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_slugs_action_t, actionVal) }, \
-         { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_slugs_action_t, target) }, \
-         { "actionId", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_slugs_action_t, actionId) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a slugs_action message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_action_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t actionId, uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, actionVal);
-	_mav_put_uint8_t(buf, 2, target);
-	_mav_put_uint8_t(buf, 3, actionId);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_slugs_action_t packet;
-	packet.actionVal = actionVal;
-	packet.target = target;
-	packet.actionId = actionId;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_ACTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 4, 65);
-}
-
-/**
- * @brief Pack a slugs_action message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_action_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t actionId,uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, actionVal);
-	_mav_put_uint8_t(buf, 2, target);
-	_mav_put_uint8_t(buf, 3, actionId);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 4);
-#else
-	mavlink_slugs_action_t packet;
-	packet.actionVal = actionVal;
-	packet.target = target;
-	packet.actionId = actionId;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_ACTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4, 65);
-}
-
-/**
- * @brief Encode a slugs_action struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param slugs_action C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_slugs_action_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_slugs_action_t* slugs_action)
-{
-	return mavlink_msg_slugs_action_pack(system_id, component_id, msg, slugs_action->target, slugs_action->actionId, slugs_action->actionVal);
-}
-
-/**
- * @brief Send a slugs_action message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system reporting the action
- * @param actionId Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- * @param actionVal Value associated with the action
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_slugs_action_send(mavlink_channel_t chan, uint8_t target, uint8_t actionId, uint16_t actionVal)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint16_t(buf, 0, actionVal);
-	_mav_put_uint8_t(buf, 2, target);
-	_mav_put_uint8_t(buf, 3, actionId);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_ACTION, buf, 4, 65);
-#else
-	mavlink_slugs_action_t packet;
-	packet.actionVal = actionVal;
-	packet.target = target;
-	packet.actionId = actionId;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_ACTION, (const char *)&packet, 4, 65);
-#endif
-}
-
-#endif
-
-// MESSAGE SLUGS_ACTION UNPACKING
-
-
-/**
- * @brief Get field target from slugs_action message
- *
- * @return The system reporting the action
- */
-static inline uint8_t mavlink_msg_slugs_action_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field actionId from slugs_action message
- *
- * @return Action ID. See apDefinitions.h in the SLUGS /clib directory for the ID names
- */
-static inline uint8_t mavlink_msg_slugs_action_get_actionId(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field actionVal from slugs_action message
- *
- * @return Value associated with the action
- */
-static inline uint16_t mavlink_msg_slugs_action_get_actionVal(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  0);
-}
-
-/**
- * @brief Decode a slugs_action message into a struct
- *
- * @param msg The message to decode
- * @param slugs_action C-struct to decode the message contents into
- */
-static inline void mavlink_msg_slugs_action_decode(const mavlink_message_t* msg, mavlink_slugs_action_t* slugs_action)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	slugs_action->actionVal = mavlink_msg_slugs_action_get_actionVal(msg);
-	slugs_action->target = mavlink_msg_slugs_action_get_target(msg);
-	slugs_action->actionId = mavlink_msg_slugs_action_get_actionId(msg);
-#else
-	memcpy(slugs_action, _MAV_PAYLOAD(msg), 4);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_navigation.h b/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_navigation.h
deleted file mode 100644
index b29a88997..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/mavlink_msg_slugs_navigation.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// MESSAGE SLUGS_NAVIGATION PACKING
-
-#define MAVLINK_MSG_ID_SLUGS_NAVIGATION 176
-
-typedef struct __mavlink_slugs_navigation_t
-{
- float u_m; ///< Measured Airspeed prior to the Nav Filter
- float phi_c; ///< Commanded Roll
- float theta_c; ///< Commanded Pitch
- float psiDot_c; ///< Commanded Turn rate
- float ay_body; ///< Y component of the body acceleration
- float totalDist; ///< Total Distance to Run on this leg of Navigation
- float dist2Go; ///< Remaining distance to Run on this leg of Navigation
- uint8_t fromWP; ///< Origin WP
- uint8_t toWP; ///< Destination WP
-} mavlink_slugs_navigation_t;
-
-#define MAVLINK_MSG_ID_SLUGS_NAVIGATION_LEN 30
-#define MAVLINK_MSG_ID_176_LEN 30
-
-
-
-#define MAVLINK_MESSAGE_INFO_SLUGS_NAVIGATION { \
-	"SLUGS_NAVIGATION", \
-	9, \
-	{  { "u_m", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_slugs_navigation_t, u_m) }, \
-         { "phi_c", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_slugs_navigation_t, phi_c) }, \
-         { "theta_c", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_slugs_navigation_t, theta_c) }, \
-         { "psiDot_c", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_slugs_navigation_t, psiDot_c) }, \
-         { "ay_body", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_slugs_navigation_t, ay_body) }, \
-         { "totalDist", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_slugs_navigation_t, totalDist) }, \
-         { "dist2Go", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_slugs_navigation_t, dist2Go) }, \
-         { "fromWP", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_slugs_navigation_t, fromWP) }, \
-         { "toWP", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_slugs_navigation_t, toWP) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a slugs_navigation message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_navigation_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float u_m, float phi_c, float theta_c, float psiDot_c, float ay_body, float totalDist, float dist2Go, uint8_t fromWP, uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_NAVIGATION;
-	return mavlink_finalize_message(msg, system_id, component_id, 30, 120);
-}
-
-/**
- * @brief Pack a slugs_navigation message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_slugs_navigation_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           float u_m,float phi_c,float theta_c,float psiDot_c,float ay_body,float totalDist,float dist2Go,uint8_t fromWP,uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 30);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 30);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_SLUGS_NAVIGATION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 30, 120);
-}
-
-/**
- * @brief Encode a slugs_navigation struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param slugs_navigation C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_slugs_navigation_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_slugs_navigation_t* slugs_navigation)
-{
-	return mavlink_msg_slugs_navigation_pack(system_id, component_id, msg, slugs_navigation->u_m, slugs_navigation->phi_c, slugs_navigation->theta_c, slugs_navigation->psiDot_c, slugs_navigation->ay_body, slugs_navigation->totalDist, slugs_navigation->dist2Go, slugs_navigation->fromWP, slugs_navigation->toWP);
-}
-
-/**
- * @brief Send a slugs_navigation message
- * @param chan MAVLink channel to send the message
- *
- * @param u_m Measured Airspeed prior to the Nav Filter
- * @param phi_c Commanded Roll
- * @param theta_c Commanded Pitch
- * @param psiDot_c Commanded Turn rate
- * @param ay_body Y component of the body acceleration
- * @param totalDist Total Distance to Run on this leg of Navigation
- * @param dist2Go Remaining distance to Run on this leg of Navigation
- * @param fromWP Origin WP
- * @param toWP Destination WP
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_slugs_navigation_send(mavlink_channel_t chan, float u_m, float phi_c, float theta_c, float psiDot_c, float ay_body, float totalDist, float dist2Go, uint8_t fromWP, uint8_t toWP)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[30];
-	_mav_put_float(buf, 0, u_m);
-	_mav_put_float(buf, 4, phi_c);
-	_mav_put_float(buf, 8, theta_c);
-	_mav_put_float(buf, 12, psiDot_c);
-	_mav_put_float(buf, 16, ay_body);
-	_mav_put_float(buf, 20, totalDist);
-	_mav_put_float(buf, 24, dist2Go);
-	_mav_put_uint8_t(buf, 28, fromWP);
-	_mav_put_uint8_t(buf, 29, toWP);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_NAVIGATION, buf, 30, 120);
-#else
-	mavlink_slugs_navigation_t packet;
-	packet.u_m = u_m;
-	packet.phi_c = phi_c;
-	packet.theta_c = theta_c;
-	packet.psiDot_c = psiDot_c;
-	packet.ay_body = ay_body;
-	packet.totalDist = totalDist;
-	packet.dist2Go = dist2Go;
-	packet.fromWP = fromWP;
-	packet.toWP = toWP;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SLUGS_NAVIGATION, (const char *)&packet, 30, 120);
-#endif
-}
-
-#endif
-
-// MESSAGE SLUGS_NAVIGATION UNPACKING
-
-
-/**
- * @brief Get field u_m from slugs_navigation message
- *
- * @return Measured Airspeed prior to the Nav Filter
- */
-static inline float mavlink_msg_slugs_navigation_get_u_m(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field phi_c from slugs_navigation message
- *
- * @return Commanded Roll
- */
-static inline float mavlink_msg_slugs_navigation_get_phi_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field theta_c from slugs_navigation message
- *
- * @return Commanded Pitch
- */
-static inline float mavlink_msg_slugs_navigation_get_theta_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field psiDot_c from slugs_navigation message
- *
- * @return Commanded Turn rate
- */
-static inline float mavlink_msg_slugs_navigation_get_psiDot_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field ay_body from slugs_navigation message
- *
- * @return Y component of the body acceleration
- */
-static inline float mavlink_msg_slugs_navigation_get_ay_body(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field totalDist from slugs_navigation message
- *
- * @return Total Distance to Run on this leg of Navigation
- */
-static inline float mavlink_msg_slugs_navigation_get_totalDist(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field dist2Go from slugs_navigation message
- *
- * @return Remaining distance to Run on this leg of Navigation
- */
-static inline float mavlink_msg_slugs_navigation_get_dist2Go(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field fromWP from slugs_navigation message
- *
- * @return Origin WP
- */
-static inline uint8_t mavlink_msg_slugs_navigation_get_fromWP(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  28);
-}
-
-/**
- * @brief Get field toWP from slugs_navigation message
- *
- * @return Destination WP
- */
-static inline uint8_t mavlink_msg_slugs_navigation_get_toWP(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  29);
-}
-
-/**
- * @brief Decode a slugs_navigation message into a struct
- *
- * @param msg The message to decode
- * @param slugs_navigation C-struct to decode the message contents into
- */
-static inline void mavlink_msg_slugs_navigation_decode(const mavlink_message_t* msg, mavlink_slugs_navigation_t* slugs_navigation)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	slugs_navigation->u_m = mavlink_msg_slugs_navigation_get_u_m(msg);
-	slugs_navigation->phi_c = mavlink_msg_slugs_navigation_get_phi_c(msg);
-	slugs_navigation->theta_c = mavlink_msg_slugs_navigation_get_theta_c(msg);
-	slugs_navigation->psiDot_c = mavlink_msg_slugs_navigation_get_psiDot_c(msg);
-	slugs_navigation->ay_body = mavlink_msg_slugs_navigation_get_ay_body(msg);
-	slugs_navigation->totalDist = mavlink_msg_slugs_navigation_get_totalDist(msg);
-	slugs_navigation->dist2Go = mavlink_msg_slugs_navigation_get_dist2Go(msg);
-	slugs_navigation->fromWP = mavlink_msg_slugs_navigation_get_fromWP(msg);
-	slugs_navigation->toWP = mavlink_msg_slugs_navigation_get_toWP(msg);
-#else
-	memcpy(slugs_navigation, _MAV_PAYLOAD(msg), 30);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/slugs/slugs.h b/mavlink/include/mavlink/v1.0/slugs/slugs.h
deleted file mode 100644
index b943624b5..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/slugs.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from slugs.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef SLUGS_H
-#define SLUGS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 10, 24, 18, 0, 0, 30, 24, 0, 7, 13, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 232, 168, 2, 0, 0, 120, 167, 0, 16, 146, 104, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_CPU_LOAD, MAVLINK_MESSAGE_INFO_AIR_DATA, MAVLINK_MESSAGE_INFO_SENSOR_BIAS, MAVLINK_MESSAGE_INFO_DIAGNOSTIC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SLUGS_NAVIGATION, MAVLINK_MESSAGE_INFO_DATA_LOG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_GPS_DATE_TIME, MAVLINK_MESSAGE_INFO_MID_LVL_CMDS, MAVLINK_MESSAGE_INFO_CTRL_SRFC_PT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SLUGS_ACTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_SLUGS
-
-#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
-
-
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_cpu_load.h"
-#include "./mavlink_msg_air_data.h"
-#include "./mavlink_msg_sensor_bias.h"
-#include "./mavlink_msg_diagnostic.h"
-#include "./mavlink_msg_slugs_navigation.h"
-#include "./mavlink_msg_data_log.h"
-#include "./mavlink_msg_gps_date_time.h"
-#include "./mavlink_msg_mid_lvl_cmds.h"
-#include "./mavlink_msg_ctrl_srfc_pt.h"
-#include "./mavlink_msg_slugs_action.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // SLUGS_H
diff --git a/mavlink/include/mavlink/v1.0/slugs/testsuite.h b/mavlink/include/mavlink/v1.0/slugs/testsuite.h
deleted file mode 100644
index 4593235a4..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/testsuite.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from slugs.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef SLUGS_TESTSUITE_H
-#define SLUGS_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_slugs(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_slugs(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_cpu_load(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_cpu_load_t packet_in = {
-		17235,
-	139,
-	206,
-	};
-	mavlink_cpu_load_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.batVolt = packet_in.batVolt;
-        	packet1.sensLoad = packet_in.sensLoad;
-        	packet1.ctrlLoad = packet_in.ctrlLoad;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_pack(system_id, component_id, &msg , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_cpu_load_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_cpu_load_send(MAVLINK_COMM_1 , packet1.sensLoad , packet1.ctrlLoad , packet1.batVolt );
-	mavlink_msg_cpu_load_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_air_data(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_air_data_t packet_in = {
-		17.0,
-	45.0,
-	17651,
-	};
-	mavlink_air_data_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.dynamicPressure = packet_in.dynamicPressure;
-        	packet1.staticPressure = packet_in.staticPressure;
-        	packet1.temperature = packet_in.temperature;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_pack(system_id, component_id, &msg , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_air_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_air_data_send(MAVLINK_COMM_1 , packet1.dynamicPressure , packet1.staticPressure , packet1.temperature );
-	mavlink_msg_air_data_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_sensor_bias(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_sensor_bias_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_sensor_bias_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.axBias = packet_in.axBias;
-        	packet1.ayBias = packet_in.ayBias;
-        	packet1.azBias = packet_in.azBias;
-        	packet1.gxBias = packet_in.gxBias;
-        	packet1.gyBias = packet_in.gyBias;
-        	packet1.gzBias = packet_in.gzBias;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_pack(system_id, component_id, &msg , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_sensor_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_sensor_bias_send(MAVLINK_COMM_1 , packet1.axBias , packet1.ayBias , packet1.azBias , packet1.gxBias , packet1.gyBias , packet1.gzBias );
-	mavlink_msg_sensor_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_diagnostic(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_diagnostic_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	17859,
-	17963,
-	18067,
-	};
-	mavlink_diagnostic_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.diagFl1 = packet_in.diagFl1;
-        	packet1.diagFl2 = packet_in.diagFl2;
-        	packet1.diagFl3 = packet_in.diagFl3;
-        	packet1.diagSh1 = packet_in.diagSh1;
-        	packet1.diagSh2 = packet_in.diagSh2;
-        	packet1.diagSh3 = packet_in.diagSh3;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_pack(system_id, component_id, &msg , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_diagnostic_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_diagnostic_send(MAVLINK_COMM_1 , packet1.diagFl1 , packet1.diagFl2 , packet1.diagFl3 , packet1.diagSh1 , packet1.diagSh2 , packet1.diagSh3 );
-	mavlink_msg_diagnostic_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs_navigation(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_slugs_navigation_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	89,
-	156,
-	};
-	mavlink_slugs_navigation_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.u_m = packet_in.u_m;
-        	packet1.phi_c = packet_in.phi_c;
-        	packet1.theta_c = packet_in.theta_c;
-        	packet1.psiDot_c = packet_in.psiDot_c;
-        	packet1.ay_body = packet_in.ay_body;
-        	packet1.totalDist = packet_in.totalDist;
-        	packet1.dist2Go = packet_in.dist2Go;
-        	packet1.fromWP = packet_in.fromWP;
-        	packet1.toWP = packet_in.toWP;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_pack(system_id, component_id, &msg , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_slugs_navigation_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_navigation_send(MAVLINK_COMM_1 , packet1.u_m , packet1.phi_c , packet1.theta_c , packet1.psiDot_c , packet1.ay_body , packet1.totalDist , packet1.dist2Go , packet1.fromWP , packet1.toWP );
-	mavlink_msg_slugs_navigation_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_data_log(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_data_log_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	};
-	mavlink_data_log_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.fl_1 = packet_in.fl_1;
-        	packet1.fl_2 = packet_in.fl_2;
-        	packet1.fl_3 = packet_in.fl_3;
-        	packet1.fl_4 = packet_in.fl_4;
-        	packet1.fl_5 = packet_in.fl_5;
-        	packet1.fl_6 = packet_in.fl_6;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_pack(system_id, component_id, &msg , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_data_log_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_data_log_send(MAVLINK_COMM_1 , packet1.fl_1 , packet1.fl_2 , packet1.fl_3 , packet1.fl_4 , packet1.fl_5 , packet1.fl_6 );
-	mavlink_msg_data_log_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_gps_date_time(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_gps_date_time_t packet_in = {
-		5,
-	72,
-	139,
-	206,
-	17,
-	84,
-	151,
-	};
-	mavlink_gps_date_time_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.year = packet_in.year;
-        	packet1.month = packet_in.month;
-        	packet1.day = packet_in.day;
-        	packet1.hour = packet_in.hour;
-        	packet1.min = packet_in.min;
-        	packet1.sec = packet_in.sec;
-        	packet1.visSat = packet_in.visSat;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_pack(system_id, component_id, &msg , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_gps_date_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_gps_date_time_send(MAVLINK_COMM_1 , packet1.year , packet1.month , packet1.day , packet1.hour , packet1.min , packet1.sec , packet1.visSat );
-	mavlink_msg_gps_date_time_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_mid_lvl_cmds(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_mid_lvl_cmds_t packet_in = {
-		17.0,
-	45.0,
-	73.0,
-	41,
-	};
-	mavlink_mid_lvl_cmds_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.hCommand = packet_in.hCommand;
-        	packet1.uCommand = packet_in.uCommand;
-        	packet1.rCommand = packet_in.rCommand;
-        	packet1.target = packet_in.target;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_pack(system_id, component_id, &msg , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_mid_lvl_cmds_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_mid_lvl_cmds_send(MAVLINK_COMM_1 , packet1.target , packet1.hCommand , packet1.uCommand , packet1.rCommand );
-	mavlink_msg_mid_lvl_cmds_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ctrl_srfc_pt(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ctrl_srfc_pt_t packet_in = {
-		17235,
-	139,
-	};
-	mavlink_ctrl_srfc_pt_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.bitfieldPt = packet_in.bitfieldPt;
-        	packet1.target = packet_in.target;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_pack(system_id, component_id, &msg , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ctrl_srfc_pt_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ctrl_srfc_pt_send(MAVLINK_COMM_1 , packet1.target , packet1.bitfieldPt );
-	mavlink_msg_ctrl_srfc_pt_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs_action(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_slugs_action_t packet_in = {
-		17235,
-	139,
-	206,
-	};
-	mavlink_slugs_action_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.actionVal = packet_in.actionVal;
-        	packet1.target = packet_in.target;
-        	packet1.actionId = packet_in.actionId;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_pack(system_id, component_id, &msg , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_slugs_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_slugs_action_send(MAVLINK_COMM_1 , packet1.target , packet1.actionId , packet1.actionVal );
-	mavlink_msg_slugs_action_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_slugs(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_cpu_load(system_id, component_id, last_msg);
-	mavlink_test_air_data(system_id, component_id, last_msg);
-	mavlink_test_sensor_bias(system_id, component_id, last_msg);
-	mavlink_test_diagnostic(system_id, component_id, last_msg);
-	mavlink_test_slugs_navigation(system_id, component_id, last_msg);
-	mavlink_test_data_log(system_id, component_id, last_msg);
-	mavlink_test_gps_date_time(system_id, component_id, last_msg);
-	mavlink_test_mid_lvl_cmds(system_id, component_id, last_msg);
-	mavlink_test_ctrl_srfc_pt(system_id, component_id, last_msg);
-	mavlink_test_slugs_action(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // SLUGS_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v1.0/slugs/version.h b/mavlink/include/mavlink/v1.0/slugs/version.h
deleted file mode 100644
index 8e8d05f90..000000000
--- a/mavlink/include/mavlink/v1.0/slugs/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from slugs.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:53 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v1.0/test/mavlink.h b/mavlink/include/mavlink/v1.0/test/mavlink.h
deleted file mode 100644
index e596b8fba..000000000
--- a/mavlink/include/mavlink/v1.0/test/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from test.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 254
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_LITTLE_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 1
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 1
-#endif
-
-#include "version.h"
-#include "test.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v1.0/test/mavlink_msg_test_types.h b/mavlink/include/mavlink/v1.0/test/mavlink_msg_test_types.h
deleted file mode 100644
index 9300998f8..000000000
--- a/mavlink/include/mavlink/v1.0/test/mavlink_msg_test_types.h
+++ /dev/null
@@ -1,610 +0,0 @@
-// MESSAGE TEST_TYPES PACKING
-
-#define MAVLINK_MSG_ID_TEST_TYPES 0
-
-typedef struct __mavlink_test_types_t
-{
- uint64_t u64; ///< uint64_t
- int64_t s64; ///< int64_t
- double d; ///< double
- uint64_t u64_array[3]; ///< uint64_t_array
- int64_t s64_array[3]; ///< int64_t_array
- double d_array[3]; ///< double_array
- uint32_t u32; ///< uint32_t
- int32_t s32; ///< int32_t
- float f; ///< float
- uint32_t u32_array[3]; ///< uint32_t_array
- int32_t s32_array[3]; ///< int32_t_array
- float f_array[3]; ///< float_array
- uint16_t u16; ///< uint16_t
- int16_t s16; ///< int16_t
- uint16_t u16_array[3]; ///< uint16_t_array
- int16_t s16_array[3]; ///< int16_t_array
- char c; ///< char
- char s[10]; ///< string
- uint8_t u8; ///< uint8_t
- int8_t s8; ///< int8_t
- uint8_t u8_array[3]; ///< uint8_t_array
- int8_t s8_array[3]; ///< int8_t_array
-} mavlink_test_types_t;
-
-#define MAVLINK_MSG_ID_TEST_TYPES_LEN 179
-#define MAVLINK_MSG_ID_0_LEN 179
-
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U64_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S64_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_D_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U32_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S32_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_F_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U16_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S16_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S_LEN 10
-#define MAVLINK_MSG_TEST_TYPES_FIELD_U8_ARRAY_LEN 3
-#define MAVLINK_MSG_TEST_TYPES_FIELD_S8_ARRAY_LEN 3
-
-#define MAVLINK_MESSAGE_INFO_TEST_TYPES { \
-	"TEST_TYPES", \
-	22, \
-	{  { "u64", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_test_types_t, u64) }, \
-         { "s64", NULL, MAVLINK_TYPE_INT64_T, 0, 8, offsetof(mavlink_test_types_t, s64) }, \
-         { "d", NULL, MAVLINK_TYPE_DOUBLE, 0, 16, offsetof(mavlink_test_types_t, d) }, \
-         { "u64_array", NULL, MAVLINK_TYPE_UINT64_T, 3, 24, offsetof(mavlink_test_types_t, u64_array) }, \
-         { "s64_array", NULL, MAVLINK_TYPE_INT64_T, 3, 48, offsetof(mavlink_test_types_t, s64_array) }, \
-         { "d_array", NULL, MAVLINK_TYPE_DOUBLE, 3, 72, offsetof(mavlink_test_types_t, d_array) }, \
-         { "u32", "0x%08x", MAVLINK_TYPE_UINT32_T, 0, 96, offsetof(mavlink_test_types_t, u32) }, \
-         { "s32", NULL, MAVLINK_TYPE_INT32_T, 0, 100, offsetof(mavlink_test_types_t, s32) }, \
-         { "f", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_test_types_t, f) }, \
-         { "u32_array", NULL, MAVLINK_TYPE_UINT32_T, 3, 108, offsetof(mavlink_test_types_t, u32_array) }, \
-         { "s32_array", NULL, MAVLINK_TYPE_INT32_T, 3, 120, offsetof(mavlink_test_types_t, s32_array) }, \
-         { "f_array", NULL, MAVLINK_TYPE_FLOAT, 3, 132, offsetof(mavlink_test_types_t, f_array) }, \
-         { "u16", NULL, MAVLINK_TYPE_UINT16_T, 0, 144, offsetof(mavlink_test_types_t, u16) }, \
-         { "s16", NULL, MAVLINK_TYPE_INT16_T, 0, 146, offsetof(mavlink_test_types_t, s16) }, \
-         { "u16_array", NULL, MAVLINK_TYPE_UINT16_T, 3, 148, offsetof(mavlink_test_types_t, u16_array) }, \
-         { "s16_array", NULL, MAVLINK_TYPE_INT16_T, 3, 154, offsetof(mavlink_test_types_t, s16_array) }, \
-         { "c", NULL, MAVLINK_TYPE_CHAR, 0, 160, offsetof(mavlink_test_types_t, c) }, \
-         { "s", NULL, MAVLINK_TYPE_CHAR, 10, 161, offsetof(mavlink_test_types_t, s) }, \
-         { "u8", NULL, MAVLINK_TYPE_UINT8_T, 0, 171, offsetof(mavlink_test_types_t, u8) }, \
-         { "s8", NULL, MAVLINK_TYPE_INT8_T, 0, 172, offsetof(mavlink_test_types_t, s8) }, \
-         { "u8_array", NULL, MAVLINK_TYPE_UINT8_T, 3, 173, offsetof(mavlink_test_types_t, u8_array) }, \
-         { "s8_array", NULL, MAVLINK_TYPE_INT8_T, 3, 176, offsetof(mavlink_test_types_t, s8_array) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a test_types message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_test_types_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       char c, const char *s, uint8_t u8, uint16_t u16, uint32_t u32, uint64_t u64, int8_t s8, int16_t s16, int32_t s32, int64_t s64, float f, double d, const uint8_t *u8_array, const uint16_t *u16_array, const uint32_t *u32_array, const uint64_t *u64_array, const int8_t *s8_array, const int16_t *s16_array, const int32_t *s32_array, const int64_t *s64_array, const float *f_array, const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_uint64_t(buf, 0, u64);
-	_mav_put_int64_t(buf, 8, s64);
-	_mav_put_double(buf, 16, d);
-	_mav_put_uint32_t(buf, 96, u32);
-	_mav_put_int32_t(buf, 100, s32);
-	_mav_put_float(buf, 104, f);
-	_mav_put_uint16_t(buf, 144, u16);
-	_mav_put_int16_t(buf, 146, s16);
-	_mav_put_char(buf, 160, c);
-	_mav_put_uint8_t(buf, 171, u8);
-	_mav_put_int8_t(buf, 172, s8);
-	_mav_put_uint64_t_array(buf, 24, u64_array, 3);
-	_mav_put_int64_t_array(buf, 48, s64_array, 3);
-	_mav_put_double_array(buf, 72, d_array, 3);
-	_mav_put_uint32_t_array(buf, 108, u32_array, 3);
-	_mav_put_int32_t_array(buf, 120, s32_array, 3);
-	_mav_put_float_array(buf, 132, f_array, 3);
-	_mav_put_uint16_t_array(buf, 148, u16_array, 3);
-	_mav_put_int16_t_array(buf, 154, s16_array, 3);
-	_mav_put_char_array(buf, 161, s, 10);
-	_mav_put_uint8_t_array(buf, 173, u8_array, 3);
-	_mav_put_int8_t_array(buf, 176, s8_array, 3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 179);
-#else
-	mavlink_test_types_t packet;
-	packet.u64 = u64;
-	packet.s64 = s64;
-	packet.d = d;
-	packet.u32 = u32;
-	packet.s32 = s32;
-	packet.f = f;
-	packet.u16 = u16;
-	packet.s16 = s16;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.s8 = s8;
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 179);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_TEST_TYPES;
-	return mavlink_finalize_message(msg, system_id, component_id, 179, 103);
-}
-
-/**
- * @brief Pack a test_types message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_test_types_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           char c,const char *s,uint8_t u8,uint16_t u16,uint32_t u32,uint64_t u64,int8_t s8,int16_t s16,int32_t s32,int64_t s64,float f,double d,const uint8_t *u8_array,const uint16_t *u16_array,const uint32_t *u32_array,const uint64_t *u64_array,const int8_t *s8_array,const int16_t *s16_array,const int32_t *s32_array,const int64_t *s64_array,const float *f_array,const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_uint64_t(buf, 0, u64);
-	_mav_put_int64_t(buf, 8, s64);
-	_mav_put_double(buf, 16, d);
-	_mav_put_uint32_t(buf, 96, u32);
-	_mav_put_int32_t(buf, 100, s32);
-	_mav_put_float(buf, 104, f);
-	_mav_put_uint16_t(buf, 144, u16);
-	_mav_put_int16_t(buf, 146, s16);
-	_mav_put_char(buf, 160, c);
-	_mav_put_uint8_t(buf, 171, u8);
-	_mav_put_int8_t(buf, 172, s8);
-	_mav_put_uint64_t_array(buf, 24, u64_array, 3);
-	_mav_put_int64_t_array(buf, 48, s64_array, 3);
-	_mav_put_double_array(buf, 72, d_array, 3);
-	_mav_put_uint32_t_array(buf, 108, u32_array, 3);
-	_mav_put_int32_t_array(buf, 120, s32_array, 3);
-	_mav_put_float_array(buf, 132, f_array, 3);
-	_mav_put_uint16_t_array(buf, 148, u16_array, 3);
-	_mav_put_int16_t_array(buf, 154, s16_array, 3);
-	_mav_put_char_array(buf, 161, s, 10);
-	_mav_put_uint8_t_array(buf, 173, u8_array, 3);
-	_mav_put_int8_t_array(buf, 176, s8_array, 3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 179);
-#else
-	mavlink_test_types_t packet;
-	packet.u64 = u64;
-	packet.s64 = s64;
-	packet.d = d;
-	packet.u32 = u32;
-	packet.s32 = s32;
-	packet.f = f;
-	packet.u16 = u16;
-	packet.s16 = s16;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.s8 = s8;
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 179);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_TEST_TYPES;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 179, 103);
-}
-
-/**
- * @brief Encode a test_types struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param test_types C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_test_types_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_test_types_t* test_types)
-{
-	return mavlink_msg_test_types_pack(system_id, component_id, msg, test_types->c, test_types->s, test_types->u8, test_types->u16, test_types->u32, test_types->u64, test_types->s8, test_types->s16, test_types->s32, test_types->s64, test_types->f, test_types->d, test_types->u8_array, test_types->u16_array, test_types->u32_array, test_types->u64_array, test_types->s8_array, test_types->s16_array, test_types->s32_array, test_types->s64_array, test_types->f_array, test_types->d_array);
-}
-
-/**
- * @brief Send a test_types message
- * @param chan MAVLink channel to send the message
- *
- * @param c char
- * @param s string
- * @param u8 uint8_t
- * @param u16 uint16_t
- * @param u32 uint32_t
- * @param u64 uint64_t
- * @param s8 int8_t
- * @param s16 int16_t
- * @param s32 int32_t
- * @param s64 int64_t
- * @param f float
- * @param d double
- * @param u8_array uint8_t_array
- * @param u16_array uint16_t_array
- * @param u32_array uint32_t_array
- * @param u64_array uint64_t_array
- * @param s8_array int8_t_array
- * @param s16_array int16_t_array
- * @param s32_array int32_t_array
- * @param s64_array int64_t_array
- * @param f_array float_array
- * @param d_array double_array
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_test_types_send(mavlink_channel_t chan, char c, const char *s, uint8_t u8, uint16_t u16, uint32_t u32, uint64_t u64, int8_t s8, int16_t s16, int32_t s32, int64_t s64, float f, double d, const uint8_t *u8_array, const uint16_t *u16_array, const uint32_t *u32_array, const uint64_t *u64_array, const int8_t *s8_array, const int16_t *s16_array, const int32_t *s32_array, const int64_t *s64_array, const float *f_array, const double *d_array)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[179];
-	_mav_put_uint64_t(buf, 0, u64);
-	_mav_put_int64_t(buf, 8, s64);
-	_mav_put_double(buf, 16, d);
-	_mav_put_uint32_t(buf, 96, u32);
-	_mav_put_int32_t(buf, 100, s32);
-	_mav_put_float(buf, 104, f);
-	_mav_put_uint16_t(buf, 144, u16);
-	_mav_put_int16_t(buf, 146, s16);
-	_mav_put_char(buf, 160, c);
-	_mav_put_uint8_t(buf, 171, u8);
-	_mav_put_int8_t(buf, 172, s8);
-	_mav_put_uint64_t_array(buf, 24, u64_array, 3);
-	_mav_put_int64_t_array(buf, 48, s64_array, 3);
-	_mav_put_double_array(buf, 72, d_array, 3);
-	_mav_put_uint32_t_array(buf, 108, u32_array, 3);
-	_mav_put_int32_t_array(buf, 120, s32_array, 3);
-	_mav_put_float_array(buf, 132, f_array, 3);
-	_mav_put_uint16_t_array(buf, 148, u16_array, 3);
-	_mav_put_int16_t_array(buf, 154, s16_array, 3);
-	_mav_put_char_array(buf, 161, s, 10);
-	_mav_put_uint8_t_array(buf, 173, u8_array, 3);
-	_mav_put_int8_t_array(buf, 176, s8_array, 3);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_TEST_TYPES, buf, 179, 103);
-#else
-	mavlink_test_types_t packet;
-	packet.u64 = u64;
-	packet.s64 = s64;
-	packet.d = d;
-	packet.u32 = u32;
-	packet.s32 = s32;
-	packet.f = f;
-	packet.u16 = u16;
-	packet.s16 = s16;
-	packet.c = c;
-	packet.u8 = u8;
-	packet.s8 = s8;
-	mav_array_memcpy(packet.u64_array, u64_array, sizeof(uint64_t)*3);
-	mav_array_memcpy(packet.s64_array, s64_array, sizeof(int64_t)*3);
-	mav_array_memcpy(packet.d_array, d_array, sizeof(double)*3);
-	mav_array_memcpy(packet.u32_array, u32_array, sizeof(uint32_t)*3);
-	mav_array_memcpy(packet.s32_array, s32_array, sizeof(int32_t)*3);
-	mav_array_memcpy(packet.f_array, f_array, sizeof(float)*3);
-	mav_array_memcpy(packet.u16_array, u16_array, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.s16_array, s16_array, sizeof(int16_t)*3);
-	mav_array_memcpy(packet.s, s, sizeof(char)*10);
-	mav_array_memcpy(packet.u8_array, u8_array, sizeof(uint8_t)*3);
-	mav_array_memcpy(packet.s8_array, s8_array, sizeof(int8_t)*3);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_TEST_TYPES, (const char *)&packet, 179, 103);
-#endif
-}
-
-#endif
-
-// MESSAGE TEST_TYPES UNPACKING
-
-
-/**
- * @brief Get field c from test_types message
- *
- * @return char
- */
-static inline char mavlink_msg_test_types_get_c(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_char(msg,  160);
-}
-
-/**
- * @brief Get field s from test_types message
- *
- * @return string
- */
-static inline uint16_t mavlink_msg_test_types_get_s(const mavlink_message_t* msg, char *s)
-{
-	return _MAV_RETURN_char_array(msg, s, 10,  161);
-}
-
-/**
- * @brief Get field u8 from test_types message
- *
- * @return uint8_t
- */
-static inline uint8_t mavlink_msg_test_types_get_u8(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  171);
-}
-
-/**
- * @brief Get field u16 from test_types message
- *
- * @return uint16_t
- */
-static inline uint16_t mavlink_msg_test_types_get_u16(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint16_t(msg,  144);
-}
-
-/**
- * @brief Get field u32 from test_types message
- *
- * @return uint32_t
- */
-static inline uint32_t mavlink_msg_test_types_get_u32(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  96);
-}
-
-/**
- * @brief Get field u64 from test_types message
- *
- * @return uint64_t
- */
-static inline uint64_t mavlink_msg_test_types_get_u64(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field s8 from test_types message
- *
- * @return int8_t
- */
-static inline int8_t mavlink_msg_test_types_get_s8(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int8_t(msg,  172);
-}
-
-/**
- * @brief Get field s16 from test_types message
- *
- * @return int16_t
- */
-static inline int16_t mavlink_msg_test_types_get_s16(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int16_t(msg,  146);
-}
-
-/**
- * @brief Get field s32 from test_types message
- *
- * @return int32_t
- */
-static inline int32_t mavlink_msg_test_types_get_s32(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  100);
-}
-
-/**
- * @brief Get field s64 from test_types message
- *
- * @return int64_t
- */
-static inline int64_t mavlink_msg_test_types_get_s64(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int64_t(msg,  8);
-}
-
-/**
- * @brief Get field f from test_types message
- *
- * @return float
- */
-static inline float mavlink_msg_test_types_get_f(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  104);
-}
-
-/**
- * @brief Get field d from test_types message
- *
- * @return double
- */
-static inline double mavlink_msg_test_types_get_d(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_double(msg,  16);
-}
-
-/**
- * @brief Get field u8_array from test_types message
- *
- * @return uint8_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u8_array(const mavlink_message_t* msg, uint8_t *u8_array)
-{
-	return _MAV_RETURN_uint8_t_array(msg, u8_array, 3,  173);
-}
-
-/**
- * @brief Get field u16_array from test_types message
- *
- * @return uint16_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u16_array(const mavlink_message_t* msg, uint16_t *u16_array)
-{
-	return _MAV_RETURN_uint16_t_array(msg, u16_array, 3,  148);
-}
-
-/**
- * @brief Get field u32_array from test_types message
- *
- * @return uint32_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u32_array(const mavlink_message_t* msg, uint32_t *u32_array)
-{
-	return _MAV_RETURN_uint32_t_array(msg, u32_array, 3,  108);
-}
-
-/**
- * @brief Get field u64_array from test_types message
- *
- * @return uint64_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_u64_array(const mavlink_message_t* msg, uint64_t *u64_array)
-{
-	return _MAV_RETURN_uint64_t_array(msg, u64_array, 3,  24);
-}
-
-/**
- * @brief Get field s8_array from test_types message
- *
- * @return int8_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s8_array(const mavlink_message_t* msg, int8_t *s8_array)
-{
-	return _MAV_RETURN_int8_t_array(msg, s8_array, 3,  176);
-}
-
-/**
- * @brief Get field s16_array from test_types message
- *
- * @return int16_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s16_array(const mavlink_message_t* msg, int16_t *s16_array)
-{
-	return _MAV_RETURN_int16_t_array(msg, s16_array, 3,  154);
-}
-
-/**
- * @brief Get field s32_array from test_types message
- *
- * @return int32_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s32_array(const mavlink_message_t* msg, int32_t *s32_array)
-{
-	return _MAV_RETURN_int32_t_array(msg, s32_array, 3,  120);
-}
-
-/**
- * @brief Get field s64_array from test_types message
- *
- * @return int64_t_array
- */
-static inline uint16_t mavlink_msg_test_types_get_s64_array(const mavlink_message_t* msg, int64_t *s64_array)
-{
-	return _MAV_RETURN_int64_t_array(msg, s64_array, 3,  48);
-}
-
-/**
- * @brief Get field f_array from test_types message
- *
- * @return float_array
- */
-static inline uint16_t mavlink_msg_test_types_get_f_array(const mavlink_message_t* msg, float *f_array)
-{
-	return _MAV_RETURN_float_array(msg, f_array, 3,  132);
-}
-
-/**
- * @brief Get field d_array from test_types message
- *
- * @return double_array
- */
-static inline uint16_t mavlink_msg_test_types_get_d_array(const mavlink_message_t* msg, double *d_array)
-{
-	return _MAV_RETURN_double_array(msg, d_array, 3,  72);
-}
-
-/**
- * @brief Decode a test_types message into a struct
- *
- * @param msg The message to decode
- * @param test_types C-struct to decode the message contents into
- */
-static inline void mavlink_msg_test_types_decode(const mavlink_message_t* msg, mavlink_test_types_t* test_types)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	test_types->u64 = mavlink_msg_test_types_get_u64(msg);
-	test_types->s64 = mavlink_msg_test_types_get_s64(msg);
-	test_types->d = mavlink_msg_test_types_get_d(msg);
-	mavlink_msg_test_types_get_u64_array(msg, test_types->u64_array);
-	mavlink_msg_test_types_get_s64_array(msg, test_types->s64_array);
-	mavlink_msg_test_types_get_d_array(msg, test_types->d_array);
-	test_types->u32 = mavlink_msg_test_types_get_u32(msg);
-	test_types->s32 = mavlink_msg_test_types_get_s32(msg);
-	test_types->f = mavlink_msg_test_types_get_f(msg);
-	mavlink_msg_test_types_get_u32_array(msg, test_types->u32_array);
-	mavlink_msg_test_types_get_s32_array(msg, test_types->s32_array);
-	mavlink_msg_test_types_get_f_array(msg, test_types->f_array);
-	test_types->u16 = mavlink_msg_test_types_get_u16(msg);
-	test_types->s16 = mavlink_msg_test_types_get_s16(msg);
-	mavlink_msg_test_types_get_u16_array(msg, test_types->u16_array);
-	mavlink_msg_test_types_get_s16_array(msg, test_types->s16_array);
-	test_types->c = mavlink_msg_test_types_get_c(msg);
-	mavlink_msg_test_types_get_s(msg, test_types->s);
-	test_types->u8 = mavlink_msg_test_types_get_u8(msg);
-	test_types->s8 = mavlink_msg_test_types_get_s8(msg);
-	mavlink_msg_test_types_get_u8_array(msg, test_types->u8_array);
-	mavlink_msg_test_types_get_s8_array(msg, test_types->s8_array);
-#else
-	memcpy(test_types, _MAV_PAYLOAD(msg), 179);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/test/test.h b/mavlink/include/mavlink/v1.0/test/test.h
deleted file mode 100644
index ff552d514..000000000
--- a/mavlink/include/mavlink/v1.0/test/test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from test.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef TEST_H
-#define TEST_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_TEST_TYPES, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_TEST
-
-
-
-// MAVLINK VERSION
-
-#ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
-#if (MAVLINK_VERSION == 0)
-#undef MAVLINK_VERSION
-#define MAVLINK_VERSION 3
-#endif
-
-// ENUM DEFINITIONS
-
-
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_test_types.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // TEST_H
diff --git a/mavlink/include/mavlink/v1.0/test/testsuite.h b/mavlink/include/mavlink/v1.0/test/testsuite.h
deleted file mode 100644
index 658e1ae07..000000000
--- a/mavlink/include/mavlink/v1.0/test/testsuite.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from test.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef TEST_TESTSUITE_H
-#define TEST_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-
-static void mavlink_test_test(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-
-	mavlink_test_test(system_id, component_id, last_msg);
-}
-#endif
-
-
-
-
-static void mavlink_test_test_types(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_test_types_t packet_in = {
-		93372036854775807ULL,
-	93372036854776311LL,
-	235.0,
-	{ 93372036854777319, 93372036854777320, 93372036854777321 },
-	{ 93372036854778831, 93372036854778832, 93372036854778833 },
-	{ 627.0, 628.0, 629.0 },
-	963502456,
-	963502664,
-	745.0,
-	{ 963503080, 963503081, 963503082 },
-	{ 963503704, 963503705, 963503706 },
-	{ 941.0, 942.0, 943.0 },
-	24723,
-	24827,
-	{ 24931, 24932, 24933 },
-	{ 25243, 25244, 25245 },
-	'E',
-	"FGHIJKLMN",
-	198,
-	9,
-	{ 76, 77, 78 },
-	{ 21, 22, 23 },
-	};
-	mavlink_test_types_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.u64 = packet_in.u64;
-        	packet1.s64 = packet_in.s64;
-        	packet1.d = packet_in.d;
-        	packet1.u32 = packet_in.u32;
-        	packet1.s32 = packet_in.s32;
-        	packet1.f = packet_in.f;
-        	packet1.u16 = packet_in.u16;
-        	packet1.s16 = packet_in.s16;
-        	packet1.c = packet_in.c;
-        	packet1.u8 = packet_in.u8;
-        	packet1.s8 = packet_in.s8;
-        
-        	mav_array_memcpy(packet1.u64_array, packet_in.u64_array, sizeof(uint64_t)*3);
-        	mav_array_memcpy(packet1.s64_array, packet_in.s64_array, sizeof(int64_t)*3);
-        	mav_array_memcpy(packet1.d_array, packet_in.d_array, sizeof(double)*3);
-        	mav_array_memcpy(packet1.u32_array, packet_in.u32_array, sizeof(uint32_t)*3);
-        	mav_array_memcpy(packet1.s32_array, packet_in.s32_array, sizeof(int32_t)*3);
-        	mav_array_memcpy(packet1.f_array, packet_in.f_array, sizeof(float)*3);
-        	mav_array_memcpy(packet1.u16_array, packet_in.u16_array, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.s16_array, packet_in.s16_array, sizeof(int16_t)*3);
-        	mav_array_memcpy(packet1.s, packet_in.s, sizeof(char)*10);
-        	mav_array_memcpy(packet1.u8_array, packet_in.u8_array, sizeof(uint8_t)*3);
-        	mav_array_memcpy(packet1.s8_array, packet_in.s8_array, sizeof(int8_t)*3);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_pack(system_id, component_id, &msg , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_test_types_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_test_types_send(MAVLINK_COMM_1 , packet1.c , packet1.s , packet1.u8 , packet1.u16 , packet1.u32 , packet1.u64 , packet1.s8 , packet1.s16 , packet1.s32 , packet1.s64 , packet1.f , packet1.d , packet1.u8_array , packet1.u16_array , packet1.u32_array , packet1.u64_array , packet1.s8_array , packet1.s16_array , packet1.s32_array , packet1.s64_array , packet1.f_array , packet1.d_array );
-	mavlink_msg_test_types_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_test(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_test_types(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // TEST_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v1.0/test/version.h b/mavlink/include/mavlink/v1.0/test/version.h
deleted file mode 100644
index 5097d1bbf..000000000
--- a/mavlink/include/mavlink/v1.0/test/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from test.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/include/mavlink/v1.0/ualberta/mavlink.h b/mavlink/include/mavlink/v1.0/ualberta/mavlink.h
deleted file mode 100644
index ef6ca391f..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/mavlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ualberta.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_H
-#define MAVLINK_H
-
-#ifndef MAVLINK_STX
-#define MAVLINK_STX 254
-#endif
-
-#ifndef MAVLINK_ENDIAN
-#define MAVLINK_ENDIAN MAVLINK_LITTLE_ENDIAN
-#endif
-
-#ifndef MAVLINK_ALIGNED_FIELDS
-#define MAVLINK_ALIGNED_FIELDS 1
-#endif
-
-#ifndef MAVLINK_CRC_EXTRA
-#define MAVLINK_CRC_EXTRA 1
-#endif
-
-#include "version.h"
-#include "ualberta.h"
-
-#endif // MAVLINK_H
diff --git a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_nav_filter_bias.h b/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_nav_filter_bias.h
deleted file mode 100644
index e9f49e4ed..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_nav_filter_bias.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// MESSAGE NAV_FILTER_BIAS PACKING
-
-#define MAVLINK_MSG_ID_NAV_FILTER_BIAS 220
-
-typedef struct __mavlink_nav_filter_bias_t
-{
- uint64_t usec; ///< Timestamp (microseconds)
- float accel_0; ///< b_f[0]
- float accel_1; ///< b_f[1]
- float accel_2; ///< b_f[2]
- float gyro_0; ///< b_f[0]
- float gyro_1; ///< b_f[1]
- float gyro_2; ///< b_f[2]
-} mavlink_nav_filter_bias_t;
-
-#define MAVLINK_MSG_ID_NAV_FILTER_BIAS_LEN 32
-#define MAVLINK_MSG_ID_220_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_NAV_FILTER_BIAS { \
-	"NAV_FILTER_BIAS", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_nav_filter_bias_t, usec) }, \
-         { "accel_0", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_nav_filter_bias_t, accel_0) }, \
-         { "accel_1", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_nav_filter_bias_t, accel_1) }, \
-         { "accel_2", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_nav_filter_bias_t, accel_2) }, \
-         { "gyro_0", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_nav_filter_bias_t, gyro_0) }, \
-         { "gyro_1", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_nav_filter_bias_t, gyro_1) }, \
-         { "gyro_2", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_nav_filter_bias_t, gyro_2) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a nav_filter_bias message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float accel_0, float accel_1, float accel_2, float gyro_0, float gyro_1, float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_FILTER_BIAS;
-	return mavlink_finalize_message(msg, system_id, component_id, 32, 34);
-}
-
-/**
- * @brief Pack a nav_filter_bias message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float accel_0,float accel_1,float accel_2,float gyro_0,float gyro_1,float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 32);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_NAV_FILTER_BIAS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32, 34);
-}
-
-/**
- * @brief Encode a nav_filter_bias struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param nav_filter_bias C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_nav_filter_bias_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_nav_filter_bias_t* nav_filter_bias)
-{
-	return mavlink_msg_nav_filter_bias_pack(system_id, component_id, msg, nav_filter_bias->usec, nav_filter_bias->accel_0, nav_filter_bias->accel_1, nav_filter_bias->accel_2, nav_filter_bias->gyro_0, nav_filter_bias->gyro_1, nav_filter_bias->gyro_2);
-}
-
-/**
- * @brief Send a nav_filter_bias message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds)
- * @param accel_0 b_f[0]
- * @param accel_1 b_f[1]
- * @param accel_2 b_f[2]
- * @param gyro_0 b_f[0]
- * @param gyro_1 b_f[1]
- * @param gyro_2 b_f[2]
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_nav_filter_bias_send(mavlink_channel_t chan, uint64_t usec, float accel_0, float accel_1, float accel_2, float gyro_0, float gyro_1, float gyro_2)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, accel_0);
-	_mav_put_float(buf, 12, accel_1);
-	_mav_put_float(buf, 16, accel_2);
-	_mav_put_float(buf, 20, gyro_0);
-	_mav_put_float(buf, 24, gyro_1);
-	_mav_put_float(buf, 28, gyro_2);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_FILTER_BIAS, buf, 32, 34);
-#else
-	mavlink_nav_filter_bias_t packet;
-	packet.usec = usec;
-	packet.accel_0 = accel_0;
-	packet.accel_1 = accel_1;
-	packet.accel_2 = accel_2;
-	packet.gyro_0 = gyro_0;
-	packet.gyro_1 = gyro_1;
-	packet.gyro_2 = gyro_2;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_NAV_FILTER_BIAS, (const char *)&packet, 32, 34);
-#endif
-}
-
-#endif
-
-// MESSAGE NAV_FILTER_BIAS UNPACKING
-
-
-/**
- * @brief Get field usec from nav_filter_bias message
- *
- * @return Timestamp (microseconds)
- */
-static inline uint64_t mavlink_msg_nav_filter_bias_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field accel_0 from nav_filter_bias message
- *
- * @return b_f[0]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_0(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field accel_1 from nav_filter_bias message
- *
- * @return b_f[1]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field accel_2 from nav_filter_bias message
- *
- * @return b_f[2]
- */
-static inline float mavlink_msg_nav_filter_bias_get_accel_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field gyro_0 from nav_filter_bias message
- *
- * @return b_f[0]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_0(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field gyro_1 from nav_filter_bias message
- *
- * @return b_f[1]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field gyro_2 from nav_filter_bias message
- *
- * @return b_f[2]
- */
-static inline float mavlink_msg_nav_filter_bias_get_gyro_2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a nav_filter_bias message into a struct
- *
- * @param msg The message to decode
- * @param nav_filter_bias C-struct to decode the message contents into
- */
-static inline void mavlink_msg_nav_filter_bias_decode(const mavlink_message_t* msg, mavlink_nav_filter_bias_t* nav_filter_bias)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	nav_filter_bias->usec = mavlink_msg_nav_filter_bias_get_usec(msg);
-	nav_filter_bias->accel_0 = mavlink_msg_nav_filter_bias_get_accel_0(msg);
-	nav_filter_bias->accel_1 = mavlink_msg_nav_filter_bias_get_accel_1(msg);
-	nav_filter_bias->accel_2 = mavlink_msg_nav_filter_bias_get_accel_2(msg);
-	nav_filter_bias->gyro_0 = mavlink_msg_nav_filter_bias_get_gyro_0(msg);
-	nav_filter_bias->gyro_1 = mavlink_msg_nav_filter_bias_get_gyro_1(msg);
-	nav_filter_bias->gyro_2 = mavlink_msg_nav_filter_bias_get_gyro_2(msg);
-#else
-	memcpy(nav_filter_bias, _MAV_PAYLOAD(msg), 32);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_radio_calibration.h b/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_radio_calibration.h
deleted file mode 100644
index 722703678..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_radio_calibration.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// MESSAGE RADIO_CALIBRATION PACKING
-
-#define MAVLINK_MSG_ID_RADIO_CALIBRATION 221
-
-typedef struct __mavlink_radio_calibration_t
-{
- uint16_t aileron[3]; ///< Aileron setpoints: left, center, right
- uint16_t elevator[3]; ///< Elevator setpoints: nose down, center, nose up
- uint16_t rudder[3]; ///< Rudder setpoints: nose left, center, nose right
- uint16_t gyro[2]; ///< Tail gyro mode/gain setpoints: heading hold, rate mode
- uint16_t pitch[5]; ///< Pitch curve setpoints (every 25%)
- uint16_t throttle[5]; ///< Throttle curve setpoints (every 25%)
-} mavlink_radio_calibration_t;
-
-#define MAVLINK_MSG_ID_RADIO_CALIBRATION_LEN 42
-#define MAVLINK_MSG_ID_221_LEN 42
-
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_AILERON_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_ELEVATOR_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_RUDDER_LEN 3
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_GYRO_LEN 2
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_PITCH_LEN 5
-#define MAVLINK_MSG_RADIO_CALIBRATION_FIELD_THROTTLE_LEN 5
-
-#define MAVLINK_MESSAGE_INFO_RADIO_CALIBRATION { \
-	"RADIO_CALIBRATION", \
-	6, \
-	{  { "aileron", NULL, MAVLINK_TYPE_UINT16_T, 3, 0, offsetof(mavlink_radio_calibration_t, aileron) }, \
-         { "elevator", NULL, MAVLINK_TYPE_UINT16_T, 3, 6, offsetof(mavlink_radio_calibration_t, elevator) }, \
-         { "rudder", NULL, MAVLINK_TYPE_UINT16_T, 3, 12, offsetof(mavlink_radio_calibration_t, rudder) }, \
-         { "gyro", NULL, MAVLINK_TYPE_UINT16_T, 2, 18, offsetof(mavlink_radio_calibration_t, gyro) }, \
-         { "pitch", NULL, MAVLINK_TYPE_UINT16_T, 5, 22, offsetof(mavlink_radio_calibration_t, pitch) }, \
-         { "throttle", NULL, MAVLINK_TYPE_UINT16_T, 5, 32, offsetof(mavlink_radio_calibration_t, throttle) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a radio_calibration message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_calibration_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       const uint16_t *aileron, const uint16_t *elevator, const uint16_t *rudder, const uint16_t *gyro, const uint16_t *pitch, const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO_CALIBRATION;
-	return mavlink_finalize_message(msg, system_id, component_id, 42, 71);
-}
-
-/**
- * @brief Pack a radio_calibration message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_radio_calibration_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           const uint16_t *aileron,const uint16_t *elevator,const uint16_t *rudder,const uint16_t *gyro,const uint16_t *pitch,const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 42);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 42);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_RADIO_CALIBRATION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 42, 71);
-}
-
-/**
- * @brief Encode a radio_calibration struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param radio_calibration C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_radio_calibration_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_radio_calibration_t* radio_calibration)
-{
-	return mavlink_msg_radio_calibration_pack(system_id, component_id, msg, radio_calibration->aileron, radio_calibration->elevator, radio_calibration->rudder, radio_calibration->gyro, radio_calibration->pitch, radio_calibration->throttle);
-}
-
-/**
- * @brief Send a radio_calibration message
- * @param chan MAVLink channel to send the message
- *
- * @param aileron Aileron setpoints: left, center, right
- * @param elevator Elevator setpoints: nose down, center, nose up
- * @param rudder Rudder setpoints: nose left, center, nose right
- * @param gyro Tail gyro mode/gain setpoints: heading hold, rate mode
- * @param pitch Pitch curve setpoints (every 25%)
- * @param throttle Throttle curve setpoints (every 25%)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_radio_calibration_send(mavlink_channel_t chan, const uint16_t *aileron, const uint16_t *elevator, const uint16_t *rudder, const uint16_t *gyro, const uint16_t *pitch, const uint16_t *throttle)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[42];
-
-	_mav_put_uint16_t_array(buf, 0, aileron, 3);
-	_mav_put_uint16_t_array(buf, 6, elevator, 3);
-	_mav_put_uint16_t_array(buf, 12, rudder, 3);
-	_mav_put_uint16_t_array(buf, 18, gyro, 2);
-	_mav_put_uint16_t_array(buf, 22, pitch, 5);
-	_mav_put_uint16_t_array(buf, 32, throttle, 5);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO_CALIBRATION, buf, 42, 71);
-#else
-	mavlink_radio_calibration_t packet;
-
-	mav_array_memcpy(packet.aileron, aileron, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.elevator, elevator, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.rudder, rudder, sizeof(uint16_t)*3);
-	mav_array_memcpy(packet.gyro, gyro, sizeof(uint16_t)*2);
-	mav_array_memcpy(packet.pitch, pitch, sizeof(uint16_t)*5);
-	mav_array_memcpy(packet.throttle, throttle, sizeof(uint16_t)*5);
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RADIO_CALIBRATION, (const char *)&packet, 42, 71);
-#endif
-}
-
-#endif
-
-// MESSAGE RADIO_CALIBRATION UNPACKING
-
-
-/**
- * @brief Get field aileron from radio_calibration message
- *
- * @return Aileron setpoints: left, center, right
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_aileron(const mavlink_message_t* msg, uint16_t *aileron)
-{
-	return _MAV_RETURN_uint16_t_array(msg, aileron, 3,  0);
-}
-
-/**
- * @brief Get field elevator from radio_calibration message
- *
- * @return Elevator setpoints: nose down, center, nose up
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_elevator(const mavlink_message_t* msg, uint16_t *elevator)
-{
-	return _MAV_RETURN_uint16_t_array(msg, elevator, 3,  6);
-}
-
-/**
- * @brief Get field rudder from radio_calibration message
- *
- * @return Rudder setpoints: nose left, center, nose right
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_rudder(const mavlink_message_t* msg, uint16_t *rudder)
-{
-	return _MAV_RETURN_uint16_t_array(msg, rudder, 3,  12);
-}
-
-/**
- * @brief Get field gyro from radio_calibration message
- *
- * @return Tail gyro mode/gain setpoints: heading hold, rate mode
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_gyro(const mavlink_message_t* msg, uint16_t *gyro)
-{
-	return _MAV_RETURN_uint16_t_array(msg, gyro, 2,  18);
-}
-
-/**
- * @brief Get field pitch from radio_calibration message
- *
- * @return Pitch curve setpoints (every 25%)
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_pitch(const mavlink_message_t* msg, uint16_t *pitch)
-{
-	return _MAV_RETURN_uint16_t_array(msg, pitch, 5,  22);
-}
-
-/**
- * @brief Get field throttle from radio_calibration message
- *
- * @return Throttle curve setpoints (every 25%)
- */
-static inline uint16_t mavlink_msg_radio_calibration_get_throttle(const mavlink_message_t* msg, uint16_t *throttle)
-{
-	return _MAV_RETURN_uint16_t_array(msg, throttle, 5,  32);
-}
-
-/**
- * @brief Decode a radio_calibration message into a struct
- *
- * @param msg The message to decode
- * @param radio_calibration C-struct to decode the message contents into
- */
-static inline void mavlink_msg_radio_calibration_decode(const mavlink_message_t* msg, mavlink_radio_calibration_t* radio_calibration)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	mavlink_msg_radio_calibration_get_aileron(msg, radio_calibration->aileron);
-	mavlink_msg_radio_calibration_get_elevator(msg, radio_calibration->elevator);
-	mavlink_msg_radio_calibration_get_rudder(msg, radio_calibration->rudder);
-	mavlink_msg_radio_calibration_get_gyro(msg, radio_calibration->gyro);
-	mavlink_msg_radio_calibration_get_pitch(msg, radio_calibration->pitch);
-	mavlink_msg_radio_calibration_get_throttle(msg, radio_calibration->throttle);
-#else
-	memcpy(radio_calibration, _MAV_PAYLOAD(msg), 42);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_ualberta_sys_status.h b/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_ualberta_sys_status.h
deleted file mode 100644
index 176469d25..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/mavlink_msg_ualberta_sys_status.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// MESSAGE UALBERTA_SYS_STATUS PACKING
-
-#define MAVLINK_MSG_ID_UALBERTA_SYS_STATUS 222
-
-typedef struct __mavlink_ualberta_sys_status_t
-{
- uint8_t mode; ///< System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- uint8_t nav_mode; ///< Navigation mode, see UALBERTA_NAV_MODE ENUM
- uint8_t pilot; ///< Pilot mode, see UALBERTA_PILOT_MODE
-} mavlink_ualberta_sys_status_t;
-
-#define MAVLINK_MSG_ID_UALBERTA_SYS_STATUS_LEN 3
-#define MAVLINK_MSG_ID_222_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_UALBERTA_SYS_STATUS { \
-	"UALBERTA_SYS_STATUS", \
-	3, \
-	{  { "mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_ualberta_sys_status_t, mode) }, \
-         { "nav_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_ualberta_sys_status_t, nav_mode) }, \
-         { "pilot", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_ualberta_sys_status_t, pilot) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a ualberta_sys_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t mode, uint8_t nav_mode, uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_UALBERTA_SYS_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 3, 15);
-}
-
-/**
- * @brief Pack a ualberta_sys_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t mode,uint8_t nav_mode,uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 3);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_UALBERTA_SYS_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3, 15);
-}
-
-/**
- * @brief Encode a ualberta_sys_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param ualberta_sys_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_ualberta_sys_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_ualberta_sys_status_t* ualberta_sys_status)
-{
-	return mavlink_msg_ualberta_sys_status_pack(system_id, component_id, msg, ualberta_sys_status->mode, ualberta_sys_status->nav_mode, ualberta_sys_status->pilot);
-}
-
-/**
- * @brief Send a ualberta_sys_status message
- * @param chan MAVLink channel to send the message
- *
- * @param mode System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- * @param nav_mode Navigation mode, see UALBERTA_NAV_MODE ENUM
- * @param pilot Pilot mode, see UALBERTA_PILOT_MODE
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_ualberta_sys_status_send(mavlink_channel_t chan, uint8_t mode, uint8_t nav_mode, uint8_t pilot)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, mode);
-	_mav_put_uint8_t(buf, 1, nav_mode);
-	_mav_put_uint8_t(buf, 2, pilot);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_UALBERTA_SYS_STATUS, buf, 3, 15);
-#else
-	mavlink_ualberta_sys_status_t packet;
-	packet.mode = mode;
-	packet.nav_mode = nav_mode;
-	packet.pilot = pilot;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_UALBERTA_SYS_STATUS, (const char *)&packet, 3, 15);
-#endif
-}
-
-#endif
-
-// MESSAGE UALBERTA_SYS_STATUS UNPACKING
-
-
-/**
- * @brief Get field mode from ualberta_sys_status message
- *
- * @return System mode, see UALBERTA_AUTOPILOT_MODE ENUM
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field nav_mode from ualberta_sys_status message
- *
- * @return Navigation mode, see UALBERTA_NAV_MODE ENUM
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_nav_mode(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field pilot from ualberta_sys_status message
- *
- * @return Pilot mode, see UALBERTA_PILOT_MODE
- */
-static inline uint8_t mavlink_msg_ualberta_sys_status_get_pilot(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a ualberta_sys_status message into a struct
- *
- * @param msg The message to decode
- * @param ualberta_sys_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_ualberta_sys_status_decode(const mavlink_message_t* msg, mavlink_ualberta_sys_status_t* ualberta_sys_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	ualberta_sys_status->mode = mavlink_msg_ualberta_sys_status_get_mode(msg);
-	ualberta_sys_status->nav_mode = mavlink_msg_ualberta_sys_status_get_nav_mode(msg);
-	ualberta_sys_status->pilot = mavlink_msg_ualberta_sys_status_get_pilot(msg);
-#else
-	memcpy(ualberta_sys_status, _MAV_PAYLOAD(msg), 3);
-#endif
-}
diff --git a/mavlink/include/mavlink/v1.0/ualberta/testsuite.h b/mavlink/include/mavlink/v1.0/ualberta/testsuite.h
deleted file mode 100644
index 79a6a004a..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/testsuite.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol testsuite generated from ualberta.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef UALBERTA_TESTSUITE_H
-#define UALBERTA_TESTSUITE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef MAVLINK_TEST_ALL
-#define MAVLINK_TEST_ALL
-static void mavlink_test_common(uint8_t, uint8_t, mavlink_message_t *last_msg);
-static void mavlink_test_ualberta(uint8_t, uint8_t, mavlink_message_t *last_msg);
-
-static void mavlink_test_all(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_common(system_id, component_id, last_msg);
-	mavlink_test_ualberta(system_id, component_id, last_msg);
-}
-#endif
-
-#include "../common/testsuite.h"
-
-
-static void mavlink_test_nav_filter_bias(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_nav_filter_bias_t packet_in = {
-		93372036854775807ULL,
-	73.0,
-	101.0,
-	129.0,
-	157.0,
-	185.0,
-	213.0,
-	};
-	mavlink_nav_filter_bias_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.usec = packet_in.usec;
-        	packet1.accel_0 = packet_in.accel_0;
-        	packet1.accel_1 = packet_in.accel_1;
-        	packet1.accel_2 = packet_in.accel_2;
-        	packet1.gyro_0 = packet_in.gyro_0;
-        	packet1.gyro_1 = packet_in.gyro_1;
-        	packet1.gyro_2 = packet_in.gyro_2;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_pack(system_id, component_id, &msg , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_nav_filter_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_nav_filter_bias_send(MAVLINK_COMM_1 , packet1.usec , packet1.accel_0 , packet1.accel_1 , packet1.accel_2 , packet1.gyro_0 , packet1.gyro_1 , packet1.gyro_2 );
-	mavlink_msg_nav_filter_bias_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_radio_calibration(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_radio_calibration_t packet_in = {
-		{ 17235, 17236, 17237 },
-	{ 17547, 17548, 17549 },
-	{ 17859, 17860, 17861 },
-	{ 18171, 18172 },
-	{ 18379, 18380, 18381, 18382, 18383 },
-	{ 18899, 18900, 18901, 18902, 18903 },
-	};
-	mavlink_radio_calibration_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        
-        	mav_array_memcpy(packet1.aileron, packet_in.aileron, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.elevator, packet_in.elevator, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.rudder, packet_in.rudder, sizeof(uint16_t)*3);
-        	mav_array_memcpy(packet1.gyro, packet_in.gyro, sizeof(uint16_t)*2);
-        	mav_array_memcpy(packet1.pitch, packet_in.pitch, sizeof(uint16_t)*5);
-        	mav_array_memcpy(packet1.throttle, packet_in.throttle, sizeof(uint16_t)*5);
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_pack(system_id, component_id, &msg , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_radio_calibration_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_radio_calibration_send(MAVLINK_COMM_1 , packet1.aileron , packet1.elevator , packet1.rudder , packet1.gyro , packet1.pitch , packet1.throttle );
-	mavlink_msg_radio_calibration_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ualberta_sys_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_message_t msg;
-        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
-        uint16_t i;
-	mavlink_ualberta_sys_status_t packet_in = {
-		5,
-	72,
-	139,
-	};
-	mavlink_ualberta_sys_status_t packet1, packet2;
-        memset(&packet1, 0, sizeof(packet1));
-        	packet1.mode = packet_in.mode;
-        	packet1.nav_mode = packet_in.nav_mode;
-        	packet1.pilot = packet_in.pilot;
-        
-        
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_encode(system_id, component_id, &msg, &packet1);
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_pack(system_id, component_id, &msg , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(&msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-
-        memset(&packet2, 0, sizeof(packet2));
-        mavlink_msg_to_send_buffer(buffer, &msg);
-        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
-        	comm_send_ch(MAVLINK_COMM_0, buffer[i]);
-        }
-	mavlink_msg_ualberta_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-        
-        memset(&packet2, 0, sizeof(packet2));
-	mavlink_msg_ualberta_sys_status_send(MAVLINK_COMM_1 , packet1.mode , packet1.nav_mode , packet1.pilot );
-	mavlink_msg_ualberta_sys_status_decode(last_msg, &packet2);
-        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
-}
-
-static void mavlink_test_ualberta(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
-{
-	mavlink_test_nav_filter_bias(system_id, component_id, last_msg);
-	mavlink_test_radio_calibration(system_id, component_id, last_msg);
-	mavlink_test_ualberta_sys_status(system_id, component_id, last_msg);
-}
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // UALBERTA_TESTSUITE_H
diff --git a/mavlink/include/mavlink/v1.0/ualberta/ualberta.h b/mavlink/include/mavlink/v1.0/ualberta/ualberta.h
deleted file mode 100644
index 163d0de54..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/ualberta.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol generated from ualberta.xml
- *	@see http://qgroundcontrol.org/mavlink/
- */
-#ifndef UALBERTA_H
-#define UALBERTA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// MESSAGE LENGTHS AND CRCS
-
-#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {9, 31, 12, 0, 14, 28, 3, 32, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 25, 23, 30, 101, 22, 26, 16, 14, 28, 32, 28, 28, 22, 22, 21, 6, 6, 37, 4, 4, 2, 2, 4, 2, 2, 3, 13, 12, 19, 17, 15, 15, 27, 25, 18, 18, 20, 20, 9, 54, 26, 0, 36, 0, 6, 4, 0, 21, 18, 0, 0, 0, 20, 0, 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 56, 42, 33, 0, 0, 0, 0, 0, 0, 0, 26, 32, 32, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 30, 18, 18, 51, 9, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 214, 223, 141, 33, 15, 3, 100, 24, 239, 238, 30, 200, 183, 0, 130, 0, 148, 21, 0, 52, 124, 0, 0, 0, 20, 0, 152, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 71, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 49, 170, 44, 83, 46, 0}
-#endif
-
-#ifndef MAVLINK_MESSAGE_INFO
-#define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_HEARTBEAT, MAVLINK_MESSAGE_INFO_SYS_STATUS, MAVLINK_MESSAGE_INFO_SYSTEM_TIME, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL, MAVLINK_MESSAGE_INFO_CHANGE_OPERATOR_CONTROL_ACK, MAVLINK_MESSAGE_INFO_AUTH_KEY, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_MODE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_READ, MAVLINK_MESSAGE_INFO_PARAM_REQUEST_LIST, MAVLINK_MESSAGE_INFO_PARAM_VALUE, MAVLINK_MESSAGE_INFO_PARAM_SET, MAVLINK_MESSAGE_INFO_GPS_RAW_INT, MAVLINK_MESSAGE_INFO_GPS_STATUS, MAVLINK_MESSAGE_INFO_SCALED_IMU, MAVLINK_MESSAGE_INFO_RAW_IMU, MAVLINK_MESSAGE_INFO_RAW_PRESSURE, MAVLINK_MESSAGE_INFO_SCALED_PRESSURE, MAVLINK_MESSAGE_INFO_ATTITUDE, MAVLINK_MESSAGE_INFO_ATTITUDE_QUATERNION, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_INT, MAVLINK_MESSAGE_INFO_RC_CHANNELS_SCALED, MAVLINK_MESSAGE_INFO_RC_CHANNELS_RAW, MAVLINK_MESSAGE_INFO_SERVO_OUTPUT_RAW, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_WRITE_PARTIAL_LIST, MAVLINK_MESSAGE_INFO_MISSION_ITEM, MAVLINK_MESSAGE_INFO_MISSION_REQUEST, MAVLINK_MESSAGE_INFO_MISSION_SET_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_CURRENT, MAVLINK_MESSAGE_INFO_MISSION_REQUEST_LIST, MAVLINK_MESSAGE_INFO_MISSION_COUNT, MAVLINK_MESSAGE_INFO_MISSION_CLEAR_ALL, MAVLINK_MESSAGE_INFO_MISSION_ITEM_REACHED, MAVLINK_MESSAGE_INFO_MISSION_ACK, MAVLINK_MESSAGE_INFO_SET_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_GPS_GLOBAL_ORIGIN, MAVLINK_MESSAGE_INFO_SET_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_SETPOINT, MAVLINK_MESSAGE_INFO_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SET_GLOBAL_POSITION_SETPOINT_INT, MAVLINK_MESSAGE_INFO_SAFETY_SET_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SAFETY_ALLOWED_AREA, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_SET_ROLL_PITCH_YAW_SPEED_THRUST, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_ROLL_PITCH_YAW_SPEED_THRUST_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_MOTORS_SETPOINT, MAVLINK_MESSAGE_INFO_SET_QUAD_SWARM_ROLL_PITCH_YAW_THRUST, MAVLINK_MESSAGE_INFO_NAV_CONTROLLER_OUTPUT, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_STATE_CORRECTION, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_REQUEST_DATA_STREAM, MAVLINK_MESSAGE_INFO_DATA_STREAM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MANUAL_CONTROL, MAVLINK_MESSAGE_INFO_RC_CHANNELS_OVERRIDE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_VFR_HUD, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_COMMAND_LONG, MAVLINK_MESSAGE_INFO_COMMAND_ACK, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET, MAVLINK_MESSAGE_INFO_HIL_STATE, MAVLINK_MESSAGE_INFO_HIL_CONTROLS, MAVLINK_MESSAGE_INFO_HIL_RC_INPUTS_RAW, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_OPTICAL_FLOW, MAVLINK_MESSAGE_INFO_GLOBAL_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_POSITION_ESTIMATE, MAVLINK_MESSAGE_INFO_VISION_SPEED_ESTIMATE, MAVLINK_MESSAGE_INFO_VICON_POSITION_ESTIMATE, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_NAV_FILTER_BIAS, MAVLINK_MESSAGE_INFO_RADIO_CALIBRATION, MAVLINK_MESSAGE_INFO_UALBERTA_SYS_STATUS, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_MEMORY_VECT, MAVLINK_MESSAGE_INFO_DEBUG_VECT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_FLOAT, MAVLINK_MESSAGE_INFO_NAMED_VALUE_INT, MAVLINK_MESSAGE_INFO_STATUSTEXT, MAVLINK_MESSAGE_INFO_DEBUG, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
-#endif
-
-#include "../protocol.h"
-
-#define MAVLINK_ENABLED_UALBERTA
-
-#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
-
-
-/** @brief Available autopilot modes for ualberta uav */
-#ifndef HAVE_ENUM_UALBERTA_AUTOPILOT_MODE
-#define HAVE_ENUM_UALBERTA_AUTOPILOT_MODE
-enum UALBERTA_AUTOPILOT_MODE
-{
-	MODE_MANUAL_DIRECT=1, /*  | */
-	MODE_MANUAL_SCALED=2, /*  | */
-	MODE_AUTO_PID_ATT=3, /*  | */
-	MODE_AUTO_PID_VEL=4, /*  | */
-	MODE_AUTO_PID_POS=5, /*  | */
-	UALBERTA_AUTOPILOT_MODE_ENUM_END=6, /*  | */
-};
-#endif
-
-/** @brief Navigation filter mode */
-#ifndef HAVE_ENUM_UALBERTA_NAV_MODE
-#define HAVE_ENUM_UALBERTA_NAV_MODE
-enum UALBERTA_NAV_MODE
-{
-	NAV_AHRS_INIT=1, /*  | */
-	NAV_AHRS=2, /*  | */
-	NAV_INS_GPS_INIT=3, /*  | */
-	NAV_INS_GPS=4, /*  | */
-	UALBERTA_NAV_MODE_ENUM_END=5, /*  | */
-};
-#endif
-
-/** @brief Mode currently commanded by pilot */
-#ifndef HAVE_ENUM_UALBERTA_PILOT_MODE
-#define HAVE_ENUM_UALBERTA_PILOT_MODE
-enum UALBERTA_PILOT_MODE
-{
-	PILOT_MANUAL=1, /*  | */
-	PILOT_AUTO=2, /*  | */
-	PILOT_ROTO=3, /*  | */
-	UALBERTA_PILOT_MODE_ENUM_END=4, /*  | */
-};
-#endif
-
-// MESSAGE DEFINITIONS
-#include "./mavlink_msg_nav_filter_bias.h"
-#include "./mavlink_msg_radio_calibration.h"
-#include "./mavlink_msg_ualberta_sys_status.h"
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // UALBERTA_H
diff --git a/mavlink/include/mavlink/v1.0/ualberta/version.h b/mavlink/include/mavlink/v1.0/ualberta/version.h
deleted file mode 100644
index 1d47b3fd5..000000000
--- a/mavlink/include/mavlink/v1.0/ualberta/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @file
- *	@brief MAVLink comm protocol built from ualberta.xml
- *	@see http://pixhawk.ethz.ch/software/mavlink
- */
-#ifndef MAVLINK_VERSION_H
-#define MAVLINK_VERSION_H
-
-#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
-#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
-#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
- 
-#endif // MAVLINK_VERSION_H
diff --git a/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile b/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile
deleted file mode 100644
index 7ca38b1a2..000000000
--- a/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Trivial makefile for building APM
-#
-
-#
-# Select 'mega' for the original APM, or 'mega2560' for the V2 APM.
-#
-BOARD	=	mega2560
-
-include ../libraries/AP_Common/Arduino.mk
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile b/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile
deleted file mode 100644
index 693150fb7..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-CFLAGS = -g -Wall -Werror -Os
-TESTPROTOCOL = common
-ALLPROTOCOLS = minimal test common pixhawk ardupilotmega slugs ualberta
-
-all: 
-	for p in ${ALLPROTOCOLS}; do make -f Makefile build TESTPROTOCOL=$$p; done
-
-test:
-	for p in ${ALLPROTOCOLS}; do make -f Makefile testprogs TESTPROTOCOL=$$p || exit 1; done
-
-valgrindtest:
-	for p in ${ALLPROTOCOLS}; do make -f Makefile valgrindprogs TESTPROTOCOL=$$p || exit 1; done
-
-build: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-
-testprogs: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-	./testmav0.9_${TESTPROTOCOL}
-	./testmav1.0_${TESTPROTOCOL}
-
-valgrindprogs: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-	valgrind -q ./testmav0.9_${TESTPROTOCOL}
-	valgrind -q ./testmav1.0_${TESTPROTOCOL}
-
-clean:
-	rm -rf *.o *~ testmav1.0* testmav0.9*
-
-testmav1.0_${TESTPROTOCOL}: testmav.c
-	$(CC) $(CFLAGS) -I../../include_v1.0 -I../../include_v1.0/${TESTPROTOCOL} -o $@ testmav.c
-
-testmav0.9_${TESTPROTOCOL}: testmav.c
-	$(CC) $(CFLAGS) -I../../include_v0.9 -I../../include_v0.9/${TESTPROTOCOL} -o $@ testmav.c
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln
deleted file mode 100644
index 37a305697..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmav", "testmav\testmav.vcxproj", "{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Debug|Win32.Build.0 = Debug|Win32

-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Release|Win32.ActiveCfg = Release|Win32

-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo
deleted file mode 100644
index 9b2e18cff..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo
+++ /dev/null
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj
deleted file mode 100644
index 7181b3a41..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>testmav</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>E:\pymavlink\generator\C\include_v1.0</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <None Include="ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="stdafx.h" />

-    <ClInclude Include="targetver.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="stdafx.cpp" />

-    <ClCompile Include="testmav.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
index 50a6fd45d..033746697 100644
--- a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
+++ b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
@@ -43,7 +43,7 @@ filename = args[0]
 def LoadImage(filename):
     '''return an image from the images/ directory'''
     app_dir = os.path.dirname(os.path.realpath(__file__))
-    path = os.path.join(app_dir, 'images', filename)
+    path = os.path.join(app_dir, 'files/images', filename)
     return Tkinter.PhotoImage(file=path)