Merge branch 'master' into hil_flightgear

libs/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 Sep 14 11:04:09 2012"
+#define MAVLINK_BUILD_DATE "Thu Oct 18 13:36:48 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  

libs/mavlink/include/mavlink/v1.0/common/mavlink_msg_setpoint_6dof.h

+// MESSAGE SETPOINT_6DOF PACKING
+
+#define MAVLINK_MSG_ID_SETPOINT_6DOF 149
+
+typedef struct __mavlink_setpoint_6dof_t
+{
+ float trans_x; ///< Translational Component in x
+ float trans_y; ///< Translational Component in y
+ float trans_z; ///< Translational Component in z
+ float rot_x; ///< Rotational Component in x
+ float rot_y; ///< Rotational Component in y
+ float rot_z; ///< Rotational Component in z
+ uint8_t target_system; ///< System ID
+} mavlink_setpoint_6dof_t;
+
+#define MAVLINK_MSG_ID_SETPOINT_6DOF_LEN 25
+#define MAVLINK_MSG_ID_149_LEN 25
+
+
+
+#define MAVLINK_MESSAGE_INFO_SETPOINT_6DOF { \
+	"SETPOINT_6DOF", \
+	7, \
+	{  { "trans_x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_setpoint_6dof_t, trans_x) }, \
+         { "trans_y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_setpoint_6dof_t, trans_y) }, \
+         { "trans_z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_setpoint_6dof_t, trans_z) }, \
+         { "rot_x", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_setpoint_6dof_t, rot_x) }, \
+         { "rot_y", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_setpoint_6dof_t, rot_y) }, \
+         { "rot_z", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_setpoint_6dof_t, rot_z) }, \
+         { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_setpoint_6dof_t, target_system) }, \
+         } \
+}
+
+
+/**
+ * @brief Pack a setpoint_6dof message
+ * @param system_id ID of this 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 trans_x Translational Component in x
+ * @param trans_y Translational Component in y
+ * @param trans_z Translational Component in z
+ * @param rot_x Rotational Component in x
+ * @param rot_y Rotational Component in y
+ * @param rot_z Rotational Component in z
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_setpoint_6dof_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
+						       uint8_t target_system, float trans_x, float trans_y, float trans_z, float rot_x, float rot_y, float rot_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[25];
+	_mav_put_float(buf, 0, trans_x);
+	_mav_put_float(buf, 4, trans_y);
+	_mav_put_float(buf, 8, trans_z);
+	_mav_put_float(buf, 12, rot_x);
+	_mav_put_float(buf, 16, rot_y);
+	_mav_put_float(buf, 20, rot_z);
+	_mav_put_uint8_t(buf, 24, target_system);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 25);
+#else
+	mavlink_setpoint_6dof_t packet;
+	packet.trans_x = trans_x;
+	packet.trans_y = trans_y;
+	packet.trans_z = trans_z;
+	packet.rot_x = rot_x;
+	packet.rot_y = rot_y;
+	packet.rot_z = rot_z;
+	packet.target_system = target_system;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 25);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SETPOINT_6DOF;
+	return mavlink_finalize_message(msg, system_id, component_id, 25, 15);
+}
+
+/**
+ * @brief Pack a setpoint_6dof 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 trans_x Translational Component in x
+ * @param trans_y Translational Component in y
+ * @param trans_z Translational Component in z
+ * @param rot_x Rotational Component in x
+ * @param rot_y Rotational Component in y
+ * @param rot_z Rotational Component in z
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_setpoint_6dof_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
+							   mavlink_message_t* msg,
+						           uint8_t target_system,float trans_x,float trans_y,float trans_z,float rot_x,float rot_y,float rot_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[25];
+	_mav_put_float(buf, 0, trans_x);
+	_mav_put_float(buf, 4, trans_y);
+	_mav_put_float(buf, 8, trans_z);
+	_mav_put_float(buf, 12, rot_x);
+	_mav_put_float(buf, 16, rot_y);
+	_mav_put_float(buf, 20, rot_z);
+	_mav_put_uint8_t(buf, 24, target_system);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 25);
+#else
+	mavlink_setpoint_6dof_t packet;
+	packet.trans_x = trans_x;
+	packet.trans_y = trans_y;
+	packet.trans_z = trans_z;
+	packet.rot_x = rot_x;
+	packet.rot_y = rot_y;
+	packet.rot_z = rot_z;
+	packet.target_system = target_system;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 25);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SETPOINT_6DOF;
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 25, 15);
+}
+
+/**
+ * @brief Encode a setpoint_6dof 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 setpoint_6dof C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_setpoint_6dof_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_setpoint_6dof_t* setpoint_6dof)
+{
+	return mavlink_msg_setpoint_6dof_pack(system_id, component_id, msg, setpoint_6dof->target_system, setpoint_6dof->trans_x, setpoint_6dof->trans_y, setpoint_6dof->trans_z, setpoint_6dof->rot_x, setpoint_6dof->rot_y, setpoint_6dof->rot_z);
+}
+
+/**
+ * @brief Send a setpoint_6dof message
+ * @param chan MAVLink channel to send the message
+ *
+ * @param target_system System ID
+ * @param trans_x Translational Component in x
+ * @param trans_y Translational Component in y
+ * @param trans_z Translational Component in z
+ * @param rot_x Rotational Component in x
+ * @param rot_y Rotational Component in y
+ * @param rot_z Rotational Component in z
+ */
+#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+
+static inline void mavlink_msg_setpoint_6dof_send(mavlink_channel_t chan, uint8_t target_system, float trans_x, float trans_y, float trans_z, float rot_x, float rot_y, float rot_z)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[25];
+	_mav_put_float(buf, 0, trans_x);
+	_mav_put_float(buf, 4, trans_y);
+	_mav_put_float(buf, 8, trans_z);
+	_mav_put_float(buf, 12, rot_x);
+	_mav_put_float(buf, 16, rot_y);
+	_mav_put_float(buf, 20, rot_z);
+	_mav_put_uint8_t(buf, 24, target_system);
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SETPOINT_6DOF, buf, 25, 15);
+#else
+	mavlink_setpoint_6dof_t packet;
+	packet.trans_x = trans_x;
+	packet.trans_y = trans_y;
+	packet.trans_z = trans_z;
+	packet.rot_x = rot_x;
+	packet.rot_y = rot_y;
+	packet.rot_z = rot_z;
+	packet.target_system = target_system;
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SETPOINT_6DOF, (const char *)&packet, 25, 15);
+#endif
+}
+
+#endif
+
+// MESSAGE SETPOINT_6DOF UNPACKING
+
+
+/**
+ * @brief Get field target_system from setpoint_6dof message
+ *
+ * @return System ID
+ */
+static inline uint8_t mavlink_msg_setpoint_6dof_get_target_system(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  24);
+}
+
+/**
+ * @brief Get field trans_x from setpoint_6dof message
+ *
+ * @return Translational Component in x
+ */
+static inline float mavlink_msg_setpoint_6dof_get_trans_x(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  0);
+}
+
+/**
+ * @brief Get field trans_y from setpoint_6dof message
+ *
+ * @return Translational Component in y
+ */
+static inline float mavlink_msg_setpoint_6dof_get_trans_y(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  4);
+}
+
+/**
+ * @brief Get field trans_z from setpoint_6dof message
+ *
+ * @return Translational Component in z
+ */
+static inline float mavlink_msg_setpoint_6dof_get_trans_z(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  8);
+}
+
+/**
+ * @brief Get field rot_x from setpoint_6dof message
+ *
+ * @return Rotational Component in x
+ */
+static inline float mavlink_msg_setpoint_6dof_get_rot_x(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  12);
+}
+
+/**
+ * @brief Get field rot_y from setpoint_6dof message
+ *
+ * @return Rotational Component in y
+ */
+static inline float mavlink_msg_setpoint_6dof_get_rot_y(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  16);
+}
+
+/**
+ * @brief Get field rot_z from setpoint_6dof message
+ *
+ * @return Rotational Component in z
+ */
+static inline float mavlink_msg_setpoint_6dof_get_rot_z(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  20);
+}
+
+/**
+ * @brief Decode a setpoint_6dof message into a struct
+ *
+ * @param msg The message to decode
+ * @param setpoint_6dof C-struct to decode the message contents into
+ */
+static inline void mavlink_msg_setpoint_6dof_decode(const mavlink_message_t* msg, mavlink_setpoint_6dof_t* setpoint_6dof)
+{
+#if MAVLINK_NEED_BYTE_SWAP
+	setpoint_6dof->trans_x = mavlink_msg_setpoint_6dof_get_trans_x(msg);
+	setpoint_6dof->trans_y = mavlink_msg_setpoint_6dof_get_trans_y(msg);
+	setpoint_6dof->trans_z = mavlink_msg_setpoint_6dof_get_trans_z(msg);
+	setpoint_6dof->rot_x = mavlink_msg_setpoint_6dof_get_rot_x(msg);
+	setpoint_6dof->rot_y = mavlink_msg_setpoint_6dof_get_rot_y(msg);
+	setpoint_6dof->rot_z = mavlink_msg_setpoint_6dof_get_rot_z(msg);
+	setpoint_6dof->target_system = mavlink_msg_setpoint_6dof_get_target_system(msg);
+#else
+	memcpy(setpoint_6dof, _MAV_PAYLOAD(msg), 25);
+#endif
+}

libs/mavlink/include/mavlink/v1.0/common/mavlink_msg_setpoint_8dof.h

+// MESSAGE SETPOINT_8DOF PACKING
+
+#define MAVLINK_MSG_ID_SETPOINT_8DOF 148
+
+typedef struct __mavlink_setpoint_8dof_t
+{
+ float val1; ///< Value 1
+ float val2; ///< Value 2
+ float val3; ///< Value 3
+ float val4; ///< Value 4
+ float val5; ///< Value 5
+ float val6; ///< Value 6
+ float val7; ///< Value 7
+ float val8; ///< Value 8
+ uint8_t target_system; ///< System ID
+} mavlink_setpoint_8dof_t;
+
+#define MAVLINK_MSG_ID_SETPOINT_8DOF_LEN 33
+#define MAVLINK_MSG_ID_148_LEN 33
+
+
+
+#define MAVLINK_MESSAGE_INFO_SETPOINT_8DOF { \
+	"SETPOINT_8DOF", \
+	9, \
+	{  { "val1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_setpoint_8dof_t, val1) }, \
+         { "val2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_setpoint_8dof_t, val2) }, \
+         { "val3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_setpoint_8dof_t, val3) }, \
+         { "val4", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_setpoint_8dof_t, val4) }, \
+         { "val5", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_setpoint_8dof_t, val5) }, \
+         { "val6", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_setpoint_8dof_t, val6) }, \
+         { "val7", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_setpoint_8dof_t, val7) }, \
+         { "val8", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_setpoint_8dof_t, val8) }, \
+         { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_setpoint_8dof_t, target_system) }, \
+         } \
+}
+
+
+/**
+ * @brief Pack a setpoint_8dof message
+ * @param system_id ID of this 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 val1 Value 1
+ * @param val2 Value 2
+ * @param val3 Value 3
+ * @param val4 Value 4
+ * @param val5 Value 5
+ * @param val6 Value 6
+ * @param val7 Value 7
+ * @param val8 Value 8
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_setpoint_8dof_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
+						       uint8_t target_system, float val1, float val2, float val3, float val4, float val5, float val6, float val7, float val8)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[33];
+	_mav_put_float(buf, 0, val1);
+	_mav_put_float(buf, 4, val2);
+	_mav_put_float(buf, 8, val3);
+	_mav_put_float(buf, 12, val4);
+	_mav_put_float(buf, 16, val5);
+	_mav_put_float(buf, 20, val6);
+	_mav_put_float(buf, 24, val7);
+	_mav_put_float(buf, 28, val8);
+	_mav_put_uint8_t(buf, 32, target_system);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 33);
+#else
+	mavlink_setpoint_8dof_t packet;
+	packet.val1 = val1;
+	packet.val2 = val2;
+	packet.val3 = val3;
+	packet.val4 = val4;
+	packet.val5 = val5;
+	packet.val6 = val6;
+	packet.val7 = val7;
+	packet.val8 = val8;
+	packet.target_system = target_system;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 33);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SETPOINT_8DOF;
+	return mavlink_finalize_message(msg, system_id, component_id, 33, 241);
+}
+
+/**
+ * @brief Pack a setpoint_8dof 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 val1 Value 1
+ * @param val2 Value 2
+ * @param val3 Value 3
+ * @param val4 Value 4
+ * @param val5 Value 5
+ * @param val6 Value 6
+ * @param val7 Value 7
+ * @param val8 Value 8
+ * @return length of the message in bytes (excluding serial stream start sign)
+ */
+static inline uint16_t mavlink_msg_setpoint_8dof_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
+							   mavlink_message_t* msg,
+						           uint8_t target_system,float val1,float val2,float val3,float val4,float val5,float val6,float val7,float val8)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[33];
+	_mav_put_float(buf, 0, val1);
+	_mav_put_float(buf, 4, val2);
+	_mav_put_float(buf, 8, val3);
+	_mav_put_float(buf, 12, val4);
+	_mav_put_float(buf, 16, val5);
+	_mav_put_float(buf, 20, val6);
+	_mav_put_float(buf, 24, val7);
+	_mav_put_float(buf, 28, val8);
+	_mav_put_uint8_t(buf, 32, target_system);
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 33);
+#else
+	mavlink_setpoint_8dof_t packet;
+	packet.val1 = val1;
+	packet.val2 = val2;
+	packet.val3 = val3;
+	packet.val4 = val4;
+	packet.val5 = val5;
+	packet.val6 = val6;
+	packet.val7 = val7;
+	packet.val8 = val8;
+	packet.target_system = target_system;
+
+        memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 33);
+#endif
+
+	msg->msgid = MAVLINK_MSG_ID_SETPOINT_8DOF;
+	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 33, 241);
+}
+
+/**
+ * @brief Encode a setpoint_8dof 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 setpoint_8dof C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_setpoint_8dof_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_setpoint_8dof_t* setpoint_8dof)
+{
+	return mavlink_msg_setpoint_8dof_pack(system_id, component_id, msg, setpoint_8dof->target_system, setpoint_8dof->val1, setpoint_8dof->val2, setpoint_8dof->val3, setpoint_8dof->val4, setpoint_8dof->val5, setpoint_8dof->val6, setpoint_8dof->val7, setpoint_8dof->val8);
+}
+
+/**
+ * @brief Send a setpoint_8dof message
+ * @param chan MAVLink channel to send the message
+ *
+ * @param target_system System ID
+ * @param val1 Value 1
+ * @param val2 Value 2
+ * @param val3 Value 3
+ * @param val4 Value 4
+ * @param val5 Value 5
+ * @param val6 Value 6
+ * @param val7 Value 7
+ * @param val8 Value 8
+ */
+#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+
+static inline void mavlink_msg_setpoint_8dof_send(mavlink_channel_t chan, uint8_t target_system, float val1, float val2, float val3, float val4, float val5, float val6, float val7, float val8)
+{
+#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
+	char buf[33];
+	_mav_put_float(buf, 0, val1);
+	_mav_put_float(buf, 4, val2);
+	_mav_put_float(buf, 8, val3);
+	_mav_put_float(buf, 12, val4);
+	_mav_put_float(buf, 16, val5);
+	_mav_put_float(buf, 20, val6);
+	_mav_put_float(buf, 24, val7);
+	_mav_put_float(buf, 28, val8);
+	_mav_put_uint8_t(buf, 32, target_system);
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SETPOINT_8DOF, buf, 33, 241);
+#else
+	mavlink_setpoint_8dof_t packet;
+	packet.val1 = val1;
+	packet.val2 = val2;
+	packet.val3 = val3;
+	packet.val4 = val4;
+	packet.val5 = val5;
+	packet.val6 = val6;
+	packet.val7 = val7;
+	packet.val8 = val8;
+	packet.target_system = target_system;
+
+	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SETPOINT_8DOF, (const char *)&packet, 33, 241);
+#endif
+}
+
+#endif
+
+// MESSAGE SETPOINT_8DOF UNPACKING
+
+
+/**
+ * @brief Get field target_system from setpoint_8dof message
+ *
+ * @return System ID
+ */
+static inline uint8_t mavlink_msg_setpoint_8dof_get_target_system(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_uint8_t(msg,  32);
+}
+
+/**
+ * @brief Get field val1 from setpoint_8dof message
+ *
+ * @return Value 1
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val1(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  0);
+}
+
+/**
+ * @brief Get field val2 from setpoint_8dof message
+ *
+ * @return Value 2
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val2(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  4);
+}
+
+/**
+ * @brief Get field val3 from setpoint_8dof message
+ *
+ * @return Value 3
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val3(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  8);
+}
+
+/**
+ * @brief Get field val4 from setpoint_8dof message
+ *
+ * @return Value 4
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val4(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  12);
+}
+
+/**
+ * @brief Get field val5 from setpoint_8dof message
+ *
+ * @return Value 5
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val5(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  16);
+}
+
+/**
+ * @brief Get field val6 from setpoint_8dof message
+ *
+ * @return Value 6
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val6(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  20);
+}
+
+/**
+ * @brief Get field val7 from setpoint_8dof message
+ *
+ * @return Value 7
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val7(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  24);
+}
+
+/**
+ * @brief Get field val8 from setpoint_8dof message
+ *
+ * @return Value 8
+ */
+static inline float mavlink_msg_setpoint_8dof_get_val8(const mavlink_message_t* msg)
+{
+	return _MAV_RETURN_float(msg,  28);
+}
+
+/**
+ * @brief Decode a setpoint_8dof message into a struct
+ *
+ * @param msg The message to decode
+ * @param setpoint_8dof C-struct to decode the message contents into
+ */
+static inline void mavlink_msg_setpoint_8dof_decode(const mavlink_message_t* msg, mavlink_setpoint_8dof_t* setpoint_8dof)
+{
+#if MAVLINK_NEED_BYTE_SWAP
+	setpoint_8dof->val1 = mavlink_msg_setpoint_8dof_get_val1(msg);
+	setpoint_8dof->val2 = mavlink_msg_setpoint_8dof_get_val2(msg);
+	setpoint_8dof->val3 = mavlink_msg_setpoint_8dof_get_val3(msg);
+	setpoint_8dof->val4 = mavlink_msg_setpoint_8dof_get_val4(msg);
+	setpoint_8dof->val5 = mavlink_msg_setpoint_8dof_get_val5(msg);
+	setpoint_8dof->val6 = mavlink_msg_setpoint_8dof_get_val6(msg);
+	setpoint_8dof->val7 = mavlink_msg_setpoint_8dof_get_val7(msg);
+	setpoint_8dof->val8 = mavlink_msg_setpoint_8dof_get_val8(msg);
+	setpoint_8dof->target_system = mavlink_msg_setpoint_8dof_get_target_system(msg);
+#else
+	memcpy(setpoint_8dof, _MAV_PAYLOAD(msg), 33);
+#endif
+}

libs/mavlink/include/mavlink/v1.0/common/testsuite.h

@@ -3780,6 +3780,179 @@ static void mavlink_test_highres_imu(uint8_t system_id, uint8_t component_id, ma
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
 
+static void mavlink_test_battery_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_battery_status_t packet_in = {
+		17235,
+	17339,
+	17443,
+	17547,
+	17651,
+	17755,
+	17859,
+	175,
+	242,
+	};
+	mavlink_battery_status_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.voltage_cell_1 = packet_in.voltage_cell_1;
+        	packet1.voltage_cell_2 = packet_in.voltage_cell_2;
+        	packet1.voltage_cell_3 = packet_in.voltage_cell_3;
+        	packet1.voltage_cell_4 = packet_in.voltage_cell_4;
+        	packet1.voltage_cell_5 = packet_in.voltage_cell_5;
+        	packet1.voltage_cell_6 = packet_in.voltage_cell_6;
+        	packet1.current_battery = packet_in.current_battery;
+        	packet1.accu_id = packet_in.accu_id;
+        	packet1.battery_remaining = packet_in.battery_remaining;
+        
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_battery_status_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_battery_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_battery_status_pack(system_id, component_id, &msg , packet1.accu_id , packet1.voltage_cell_1 , packet1.voltage_cell_2 , packet1.voltage_cell_3 , packet1.voltage_cell_4 , packet1.voltage_cell_5 , packet1.voltage_cell_6 , packet1.current_battery , packet1.battery_remaining );
+	mavlink_msg_battery_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_battery_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.accu_id , packet1.voltage_cell_1 , packet1.voltage_cell_2 , packet1.voltage_cell_3 , packet1.voltage_cell_4 , packet1.voltage_cell_5 , packet1.voltage_cell_6 , packet1.current_battery , packet1.battery_remaining );
+	mavlink_msg_battery_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_battery_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_battery_status_send(MAVLINK_COMM_1 , packet1.accu_id , packet1.voltage_cell_1 , packet1.voltage_cell_2 , packet1.voltage_cell_3 , packet1.voltage_cell_4 , packet1.voltage_cell_5 , packet1.voltage_cell_6 , packet1.current_battery , packet1.battery_remaining );
+	mavlink_msg_battery_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
+static void mavlink_test_setpoint_8dof(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_setpoint_8dof_t packet_in = {
+		17.0,
+	45.0,
+	73.0,
+	101.0,
+	129.0,
+	157.0,
+	185.0,
+	213.0,
+	101,
+	};
+	mavlink_setpoint_8dof_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.val1 = packet_in.val1;
+        	packet1.val2 = packet_in.val2;
+        	packet1.val3 = packet_in.val3;
+        	packet1.val4 = packet_in.val4;
+        	packet1.val5 = packet_in.val5;
+        	packet1.val6 = packet_in.val6;
+        	packet1.val7 = packet_in.val7;
+        	packet1.val8 = packet_in.val8;
+        	packet1.target_system = packet_in.target_system;
+        
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_8dof_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_setpoint_8dof_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_8dof_pack(system_id, component_id, &msg , packet1.target_system , packet1.val1 , packet1.val2 , packet1.val3 , packet1.val4 , packet1.val5 , packet1.val6 , packet1.val7 , packet1.val8 );
+	mavlink_msg_setpoint_8dof_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_8dof_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.val1 , packet1.val2 , packet1.val3 , packet1.val4 , packet1.val5 , packet1.val6 , packet1.val7 , packet1.val8 );
+	mavlink_msg_setpoint_8dof_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_setpoint_8dof_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_8dof_send(MAVLINK_COMM_1 , packet1.target_system , packet1.val1 , packet1.val2 , packet1.val3 , packet1.val4 , packet1.val5 , packet1.val6 , packet1.val7 , packet1.val8 );
+	mavlink_msg_setpoint_8dof_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
+static void mavlink_test_setpoint_6dof(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_setpoint_6dof_t packet_in = {
+		17.0,
+	45.0,
+	73.0,
+	101.0,
+	129.0,
+	157.0,
+	77,
+	};
+	mavlink_setpoint_6dof_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        	packet1.trans_x = packet_in.trans_x;
+        	packet1.trans_y = packet_in.trans_y;
+        	packet1.trans_z = packet_in.trans_z;
+        	packet1.rot_x = packet_in.rot_x;
+        	packet1.rot_y = packet_in.rot_y;
+        	packet1.rot_z = packet_in.rot_z;
+        	packet1.target_system = packet_in.target_system;
+        
+        
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_6dof_encode(system_id, component_id, &msg, &packet1);
+	mavlink_msg_setpoint_6dof_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_6dof_pack(system_id, component_id, &msg , packet1.target_system , packet1.trans_x , packet1.trans_y , packet1.trans_z , packet1.rot_x , packet1.rot_y , packet1.rot_z );
+	mavlink_msg_setpoint_6dof_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_6dof_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.trans_x , packet1.trans_y , packet1.trans_z , packet1.rot_x , packet1.rot_y , packet1.rot_z );
+	mavlink_msg_setpoint_6dof_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_setpoint_6dof_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+	mavlink_msg_setpoint_6dof_send(MAVLINK_COMM_1 , packet1.target_system , packet1.trans_x , packet1.trans_y , packet1.trans_z , packet1.rot_x , packet1.rot_y , packet1.rot_z );
+	mavlink_msg_setpoint_6dof_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
 static void mavlink_test_memory_vect(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
 {
 	mavlink_message_t msg;
@@ -4138,6 +4311,9 @@ static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink
 	mavlink_test_vision_speed_estimate(system_id, component_id, last_msg);
 	mavlink_test_vicon_position_estimate(system_id, component_id, last_msg);
 	mavlink_test_highres_imu(system_id, component_id, last_msg);
+	mavlink_test_battery_status(system_id, component_id, last_msg);
+	mavlink_test_setpoint_8dof(system_id, component_id, last_msg);
+	mavlink_test_setpoint_6dof(system_id, component_id, last_msg);
 	mavlink_test_memory_vect(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);

libs/mavlink/include/mavlink/v1.0/common/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Sep 14 11:05:17 2012"
+#define MAVLINK_BUILD_DATE "Thu Oct 18 13:37:22 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  

libs/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 Sep 14 10:42:05 2012"
+#define MAVLINK_BUILD_DATE "Thu Oct 18 13:37:22 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  

libs/mavlink/include/mavlink/v1.0/pixhawk/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Sep 14 10:41:07 2012"
+#define MAVLINK_BUILD_DATE "Thu Oct 18 13:37:02 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

libs/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 Sep 14 10:41:18 2012"
+#define MAVLINK_BUILD_DATE "Thu Oct 18 13:37:13 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  

qgroundcontrol.pri

@@ -322,18 +322,16 @@ win32-msvc2008|win32-msvc2010 {
 	TARGETDIR_WIN = $$replace(TARGETDIR,"/","\\")
 
 	CONFIG(debug, debug|release) {
+		# Copy supporting library DLLs
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files" "$$TARGETDIR_WIN\\debug\\files" /E /I $$escape_expand(\\n))
-                QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\mavlink" "$$TARGETDIR_WIN\\debug\\mavlink" /E /I $$escape_expand(\\n))
-                QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\models" "$$TARGETDIR_WIN\\debug\\models" /E /I $$escape_expand(\\n))
-
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
+		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\mavlink" "$$TARGETDIR_WIN\\debug\\mavlink" /E /I $$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
 
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
+		# Copy application resources
+		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files" "$$TARGETDIR_WIN\\debug\\files" /E /I $$escape_expand(\\n))
+		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\models" "$$TARGETDIR_WIN\\debug\\models" /E /I $$escape_expand(\\n))
+
+		# Copy Qt DLLs
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\plugins" "$$TARGETDIR_WIN\\debug" /E /I $$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\phonond4.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\QtCored4.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
@@ -350,15 +348,16 @@ win32-msvc2008|win32-msvc2010 {
 	}
 
 	CONFIG(release, debug|release) {
+		# Copy supporting library DLLs
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
+		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\mavlink" "$$TARGETDIR_WIN\\release\\mavlink" /E /I $$escape_expand(\\n))
+		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
+
+		# Copy application resources
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files" "$$TARGETDIR_WIN\\release\\files" /E /I $$escape_expand(\\n))
-                QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\mavlink" "$$TARGETDIR_WIN\\release\\mavlink" /E /I $$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\models" "$$TARGETDIR_WIN\\release\\models" /E /I $$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\release\\earth.html" $$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\release\\earth.html" $$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
-		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
+
+		# Copy Qt DLLs
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\plugins" "$$TARGETDIR_WIN\\release" /E /I $$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\phonon4.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\QtCore4.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
@@ -374,6 +373,13 @@ win32-msvc2008|win32-msvc2010 {
 		QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\QtXmlPatterns4.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(del /F "$$TARGETDIR_WIN\\release\\qgroundcontrol.exp"$$escape_expand(\\n))
 		QMAKE_POST_LINK += $$quote(del /F "$$TARGETDIR_WIN\\release\\qgroundcontrol.lib"$$escape_expand(\\n))
+
+		# Copy Visual Studio DLLs
+		# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
+		# I'm not certain of the path for VS2008, so this only works for VS2010.
+		win32-msvc2010 {
+			QMAKE_POST_LINK += $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\""  "$$TARGETDIR_WIN\\release\\"$$escape_expand(\\n))
+		}
 	}
 }
 
@@ -440,17 +446,15 @@ win32-g++ {
 		exists($$TARGETDIR/debug) {
 			QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
 			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\files\" \"$$TARGETDIR_WIN\\debug\\files\\\" /S /E /Y
-                        QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\libs\\mavlink\" \"$$TARGETDIR_WIN\\debug\\mavlink\\\" /S /E /Y
-                        QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y
-			QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\files\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\"
+			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\libs\\mavlink\" \"$$TARGETDIR_WIN\\debug\\mavlink\\\" /S /E /Y
+			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y
 		}
 
 		exists($$TARGETDIR/release) {
 			QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\\SDL.dll\"
 			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\files\" \"$$TARGETDIR_WIN\\release\\files\\\" /S /E /Y
-                        QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\libs\\mavlink\" \"$$TARGETDIR_WIN\\release\\mavlink\\\" /S /E /Y
+			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\libs\\mavlink\" \"$$TARGETDIR_WIN\\release\\mavlink\\\" /S /E /Y
 			QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\\\" /S /E /Y
-			QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\files\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\"
 		}
 
 	}

src/comm/QGCXPlaneLink.cc

@@ -428,7 +428,7 @@ void QGCXPlaneLink::readBytes()
 //                UAS* uas = dynamic_cast<UAS*>(mav);
 //                if (uas) uas->setManualControlCommands(man_roll, man_pitch, man_yaw, 0.6);
 //            }
-            else if (p.index == 16)
+            else if (xPlaneVersion == 10 && p.index == 16)
             {
                 //qDebug() << "ANG VEL:" << p.f[0] << p.f[3] << p.f[7];
                 rollspeed = p.f[2];
@@ -443,6 +443,12 @@ void QGCXPlaneLink::readBytes()
                 yaw = p.f[2] / 180.0f * M_PI;
                 emitUpdate = true;
             }
+            else if ((xPlaneVersion == 9 && p.index == 17))
+            {
+                rollspeed = p.f[2];
+                pitchspeed = p.f[1];
+                yawspeed = p.f[0];
+            }
 
 //            else if (p.index == 19)
 //            {

src/input/JoystickInput.cc

@@ -101,7 +101,7 @@ void JoystickInput::setActiveUAS(UASInterface* uas)
         tmp = dynamic_cast<UAS*>(this->uas);
         if(tmp)
         {
-            disconnect(this, SIGNAL(joystickChanged(double,double,double,double,int,int)), tmp, SLOT(setManualControlCommands(double,double,double,double)));
+            disconnect(this, SIGNAL(joystickChanged(double,double,double,double,int,int,int)), tmp, SLOT(setManualControlCommands(double,double,double,double,int,int,int)));
             disconnect(this, SIGNAL(buttonPressed(int)), tmp, SLOT(receiveButton(int)));
         }
     }
@@ -110,7 +110,7 @@ void JoystickInput::setActiveUAS(UASInterface* uas)
 
     tmp = dynamic_cast<UAS*>(this->uas);
     if(tmp) {
-        connect(this, SIGNAL(joystickChanged(double,double,double,double,int,int)), tmp, SLOT(setManualControlCommands(double,double,double,double)));
+        connect(this, SIGNAL(joystickChanged(double,double,double,double,int,int,int)), tmp, SLOT(setManualControlCommands(double,double,double,double,int,int,int)));
         connect(this, SIGNAL(buttonPressed(int)), tmp, SLOT(receiveButton(int)));
     }
     if (!isRunning())
@@ -163,7 +163,6 @@ void JoystickInput::init()
  */
 void JoystickInput::run()
 {
-
     init();
 
     forever
@@ -284,16 +283,16 @@ void JoystickInput::run()
 
         // Send new values to rest of groundstation
         emit hatDirectionChanged(xHat, yHat);
-        emit joystickChanged(y, x, yaw, thrust, xHat, yHat);
-
 
         // Display all buttons
+        int buttons = 0;
         for(int i = 0; i < SDL_JoystickNumButtons(joystick); i++)
         {
             //qDebug() << "BUTTON" << i << "is: " << SDL_JoystickGetAxis(joystick, i);
             if(SDL_JoystickGetButton(joystick, i))
             {
                 emit buttonPressed(i);
+                buttons |= 1 << i;
                 // Check if button is a UAS select button
 
                 if (uasButtonList.contains(i))
@@ -307,6 +306,7 @@ void JoystickInput::run()
             }
 
         }
+        emit joystickChanged(y, x, yaw, thrust, xHat, yHat, buttons);
 
         // Sleep, update rate of joystick is approx. 50 Hz (1000 ms / 50 = 20 ms)
         QGC::SLEEP::msleep(20);

src/input/JoystickInput.h

@@ -141,7 +141,7 @@ signals:
      * @param xHat hat vector in forward-backward direction, +1 forward, 0 center, -1 backward
      * @param yHat hat vector in left-right direction, -1 left, 0 center, +1 right
      */
-    void joystickChanged(double roll, double pitch, double yaw, double thrust, int xHat, int yHat);
+    void joystickChanged(double roll, double pitch, double yaw, double thrust, int xHat, int yHat, int buttons);
 
     /**
      * @brief Thrust lever of the joystick has changed

src/uas/UAS.cc

@@ -2435,7 +2435,7 @@ void UAS::disarmSystem()
 * Set the manual control commands. 
 * This can only be done if the system has manual inputs enabled and is armed.
 */
-void UAS::setManualControlCommands(double roll, double pitch, double yaw, double thrust)
+void UAS::setManualControlCommands(double roll, double pitch, double yaw, double thrust, int xHat, int yHat, int buttons)
 {
     // Scale values
     double rollPitchScaling = 1.0f * 1000.0f;
@@ -2450,8 +2450,6 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
     // If system has manual inputs enabled and is armed
     if(((mode & MAV_MODE_FLAG_DECODE_POSITION_MANUAL) && (mode & MAV_MODE_FLAG_DECODE_POSITION_SAFETY)) || (mode & MAV_MODE_FLAG_HIL_ENABLED))
     {
-        // XXX FIXME ADD BUTTON SUPPORT
-        quint16 buttons = 0;
         mavlink_message_t message;
         mavlink_msg_manual_control_pack(mavlink->getSystemId(), mavlink->getComponentId(), &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualThrust, (float)manualYawAngle, buttons);
         sendMessage(message);

src/uas/UAS.h

@@ -566,7 +566,7 @@ public slots:
     void disarmSystem();
 
     /** @brief Set the values for the manual control of the vehicle */
-    void setManualControlCommands(double roll, double pitch, double yaw, double thrust);
+    void setManualControlCommands(double roll, double pitch, double yaw, double thrust, int xHat, int yHat, int buttons);
     /** @brief Receive a button pressed event from an input device, e.g. joystick */
     void receiveButton(int buttonIndex);
 

src/ui/UASInfo.ui

@@ -118,7 +118,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Recv. Loss</string>
+      <string>MAV RX Loss</string>
      </property>
     </widget>
    </item>
@@ -204,7 +204,7 @@
    <item row="2" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Send Loss</string>
+      <string>MAV TX Loss</string>
      </property>
     </widget>
    </item>