Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: re-generate

This commit is contained in:
Andrew Tridgell 2015-01-29 09:11:47 +11:00
parent df735e2ddb
commit 51ce4d3217
5 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
View File

@ -20,7 +20,7 @@ extern "C" {
#endif #endif
#ifndef MAVLINK_MESSAGE_CRCS #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, 78, 0, 0, 0, 15, 3, 0, 0, 0, 0, 0, 153, 183, 51, 82, 118, 148, 21, 0, 243, 124, 0, 0, 38, 20, 158, 152, 143, 0, 0, 0, 106, 49, 22, 143, 140, 5, 150, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 93, 138, 108, 32, 185, 84, 34, 0, 124, 237, 4, 76, 128, 56, 116, 134, 237, 203, 250, 87, 203, 220, 25, 226, 0, 29, 223, 85, 6, 229, 203, 1, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 178, 0, 134, 219, 208, 188, 84, 22, 19, 21, 134, 0, 78, 68, 189, 127, 154, 21, 21, 144, 1, 234, 73, 181, 22, 83, 167, 138, 234, 240, 47, 189, 52, 174, 229, 0, 89, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 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, 78, 0, 0, 0, 15, 3, 0, 0, 0, 0, 0, 153, 183, 51, 82, 118, 148, 21, 0, 243, 124, 0, 0, 38, 20, 158, 152, 143, 0, 0, 0, 106, 49, 22, 143, 140, 5, 150, 0, 231, 183, 63, 54, 0, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 93, 138, 108, 32, 185, 84, 34, 0, 124, 237, 4, 76, 128, 56, 116, 134, 237, 203, 250, 87, 203, 220, 25, 226, 0, 29, 223, 85, 6, 229, 203, 1, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 178, 0, 134, 219, 208, 188, 84, 22, 19, 21, 134, 0, 78, 68, 189, 127, 154, 21, 21, 144, 1, 234, 73, 181, 22, 83, 167, 138, 234, 240, 47, 189, 52, 174, 229, 0, 160, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 204, 49, 170, 44, 83, 46, 0}
#endif #endif
#ifndef MAVLINK_MESSAGE_INFO #ifndef MAVLINK_MESSAGE_INFO

86
libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report.h
View File

@ -11,16 +11,16 @@ typedef struct __mavlink_gimbal_report_t
float delta_velocity_x; ///< Delta velocity X, m/s float delta_velocity_x; ///< Delta velocity X, m/s
float delta_velocity_y; ///< Delta velocity Y, m/s float delta_velocity_y; ///< Delta velocity Y, m/s
float delta_velocity_z; ///< Delta velocity Z, m/s float delta_velocity_z; ///< Delta velocity Z, m/s
float joint_yaw; ///< Joint yaw, radians
float joint_roll; ///< Joint roll, radians float joint_roll; ///< Joint roll, radians
float joint_pitch; ///< Joint pitch, radians float joint_pitch; ///< Joint pitch, radians
float joint_yaw; ///< Joint yaw, radians
} mavlink_gimbal_report_t; } mavlink_gimbal_report_t;
#define MAVLINK_MSG_ID_GIMBAL_REPORT_LEN 40 #define MAVLINK_MSG_ID_GIMBAL_REPORT_LEN 40
#define MAVLINK_MSG_ID_184_LEN 40 #define MAVLINK_MSG_ID_184_LEN 40
#define MAVLINK_MSG_ID_GIMBAL_REPORT_CRC 89 #define MAVLINK_MSG_ID_GIMBAL_REPORT_CRC 160
#define MAVLINK_MSG_ID_184_CRC 89 #define MAVLINK_MSG_ID_184_CRC 160
@ -34,9 +34,9 @@ typedef struct __mavlink_gimbal_report_t
{ "delta_velocity_x", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gimbal_report_t, delta_velocity_x) }, \ { "delta_velocity_x", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gimbal_report_t, delta_velocity_x) }, \
{ "delta_velocity_y", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gimbal_report_t, delta_velocity_y) }, \ { "delta_velocity_y", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gimbal_report_t, delta_velocity_y) }, \
{ "delta_velocity_z", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gimbal_report_t, delta_velocity_z) }, \ { "delta_velocity_z", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gimbal_report_t, delta_velocity_z) }, \
{ "joint_yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gimbal_report_t, joint_yaw) }, \ { "joint_roll", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gimbal_report_t, joint_roll) }, \
{ "joint_roll", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gimbal_report_t, joint_roll) }, \ { "joint_pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gimbal_report_t, joint_pitch) }, \
{ "joint_pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gimbal_report_t, joint_pitch) }, \ { "joint_yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gimbal_report_t, joint_yaw) }, \
} \ } \
} }
@ -54,13 +54,13 @@ typedef struct __mavlink_gimbal_report_t
* @param delta_velocity_x Delta velocity X, m/s * @param delta_velocity_x Delta velocity X, m/s
* @param delta_velocity_y Delta velocity Y, m/s * @param delta_velocity_y Delta velocity Y, m/s
* @param delta_velocity_z Delta velocity Z, m/s * @param delta_velocity_z Delta velocity Z, m/s
* @param joint_yaw Joint yaw, radians
* @param joint_roll Joint roll, radians * @param joint_roll Joint roll, radians
* @param joint_pitch Joint pitch, radians * @param joint_pitch Joint pitch, radians
* @param joint_yaw Joint yaw, radians
* @return length of the message in bytes (excluding serial stream start sign) * @return length of the message in bytes (excluding serial stream start sign)
*/ */
static inline uint16_t mavlink_msg_gimbal_report_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, static inline uint16_t mavlink_msg_gimbal_report_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_yaw, float joint_roll, float joint_pitch) uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_roll, float joint_pitch, float joint_yaw)
{ {
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN]; char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN];
@ -71,9 +71,9 @@ static inline uint16_t mavlink_msg_gimbal_report_pack(uint8_t system_id, uint8_t
_mav_put_float(buf, 16, delta_velocity_x); _mav_put_float(buf, 16, delta_velocity_x);
_mav_put_float(buf, 20, delta_velocity_y); _mav_put_float(buf, 20, delta_velocity_y);
_mav_put_float(buf, 24, delta_velocity_z); _mav_put_float(buf, 24, delta_velocity_z);
_mav_put_float(buf, 28, joint_yaw); _mav_put_float(buf, 28, joint_roll);
_mav_put_float(buf, 32, joint_roll); _mav_put_float(buf, 32, joint_pitch);
_mav_put_float(buf, 36, joint_pitch); _mav_put_float(buf, 36, joint_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN);
#else #else
@ -85,9 +85,9 @@ static inline uint16_t mavlink_msg_gimbal_report_pack(uint8_t system_id, uint8_t
packet.delta_velocity_x = delta_velocity_x; packet.delta_velocity_x = delta_velocity_x;
packet.delta_velocity_y = delta_velocity_y; packet.delta_velocity_y = delta_velocity_y;
packet.delta_velocity_z = delta_velocity_z; packet.delta_velocity_z = delta_velocity_z;
packet.joint_yaw = joint_yaw;
packet.joint_roll = joint_roll; packet.joint_roll = joint_roll;
packet.joint_pitch = joint_pitch; packet.joint_pitch = joint_pitch;
packet.joint_yaw = joint_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN); memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN);
#endif #endif
@ -113,14 +113,14 @@ static inline uint16_t mavlink_msg_gimbal_report_pack(uint8_t system_id, uint8_t
* @param delta_velocity_x Delta velocity X, m/s * @param delta_velocity_x Delta velocity X, m/s
* @param delta_velocity_y Delta velocity Y, m/s * @param delta_velocity_y Delta velocity Y, m/s
* @param delta_velocity_z Delta velocity Z, m/s * @param delta_velocity_z Delta velocity Z, m/s
* @param joint_yaw Joint yaw, radians
* @param joint_roll Joint roll, radians * @param joint_roll Joint roll, radians
* @param joint_pitch Joint pitch, radians * @param joint_pitch Joint pitch, radians
* @param joint_yaw Joint yaw, radians
* @return length of the message in bytes (excluding serial stream start sign) * @return length of the message in bytes (excluding serial stream start sign)
*/ */
static inline uint16_t mavlink_msg_gimbal_report_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, static inline uint16_t mavlink_msg_gimbal_report_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg, mavlink_message_t* msg,
uint32_t counter,float delta_angle_x,float delta_angle_y,float delta_angle_z,float delta_velocity_x,float delta_velocity_y,float delta_velocity_z,float joint_yaw,float joint_roll,float joint_pitch) uint32_t counter,float delta_angle_x,float delta_angle_y,float delta_angle_z,float delta_velocity_x,float delta_velocity_y,float delta_velocity_z,float joint_roll,float joint_pitch,float joint_yaw)
{ {
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN]; char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN];
@ -131,9 +131,9 @@ static inline uint16_t mavlink_msg_gimbal_report_pack_chan(uint8_t system_id, ui
_mav_put_float(buf, 16, delta_velocity_x); _mav_put_float(buf, 16, delta_velocity_x);
_mav_put_float(buf, 20, delta_velocity_y); _mav_put_float(buf, 20, delta_velocity_y);
_mav_put_float(buf, 24, delta_velocity_z); _mav_put_float(buf, 24, delta_velocity_z);
_mav_put_float(buf, 28, joint_yaw); _mav_put_float(buf, 28, joint_roll);
_mav_put_float(buf, 32, joint_roll); _mav_put_float(buf, 32, joint_pitch);
_mav_put_float(buf, 36, joint_pitch); _mav_put_float(buf, 36, joint_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN);
#else #else
@ -145,9 +145,9 @@ static inline uint16_t mavlink_msg_gimbal_report_pack_chan(uint8_t system_id, ui
packet.delta_velocity_x = delta_velocity_x; packet.delta_velocity_x = delta_velocity_x;
packet.delta_velocity_y = delta_velocity_y; packet.delta_velocity_y = delta_velocity_y;
packet.delta_velocity_z = delta_velocity_z; packet.delta_velocity_z = delta_velocity_z;
packet.joint_yaw = joint_yaw;
packet.joint_roll = joint_roll; packet.joint_roll = joint_roll;
packet.joint_pitch = joint_pitch; packet.joint_pitch = joint_pitch;
packet.joint_yaw = joint_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN); memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN);
#endif #endif
@ -170,7 +170,7 @@ static inline uint16_t mavlink_msg_gimbal_report_pack_chan(uint8_t system_id, ui
*/ */
static inline uint16_t mavlink_msg_gimbal_report_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gimbal_report_t* gimbal_report) static inline uint16_t mavlink_msg_gimbal_report_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gimbal_report_t* gimbal_report)
{ {
return mavlink_msg_gimbal_report_pack(system_id, component_id, msg, gimbal_report->counter, gimbal_report->delta_angle_x, gimbal_report->delta_angle_y, gimbal_report->delta_angle_z, gimbal_report->delta_velocity_x, gimbal_report->delta_velocity_y, gimbal_report->delta_velocity_z, gimbal_report->joint_yaw, gimbal_report->joint_roll, gimbal_report->joint_pitch); return mavlink_msg_gimbal_report_pack(system_id, component_id, msg, gimbal_report->counter, gimbal_report->delta_angle_x, gimbal_report->delta_angle_y, gimbal_report->delta_angle_z, gimbal_report->delta_velocity_x, gimbal_report->delta_velocity_y, gimbal_report->delta_velocity_z, gimbal_report->joint_roll, gimbal_report->joint_pitch, gimbal_report->joint_yaw);
} }
/** /**
@ -184,7 +184,7 @@ static inline uint16_t mavlink_msg_gimbal_report_encode(uint8_t system_id, uint8
*/ */
static inline uint16_t mavlink_msg_gimbal_report_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gimbal_report_t* gimbal_report) static inline uint16_t mavlink_msg_gimbal_report_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gimbal_report_t* gimbal_report)
{ {
return mavlink_msg_gimbal_report_pack_chan(system_id, component_id, chan, msg, gimbal_report->counter, gimbal_report->delta_angle_x, gimbal_report->delta_angle_y, gimbal_report->delta_angle_z, gimbal_report->delta_velocity_x, gimbal_report->delta_velocity_y, gimbal_report->delta_velocity_z, gimbal_report->joint_yaw, gimbal_report->joint_roll, gimbal_report->joint_pitch); return mavlink_msg_gimbal_report_pack_chan(system_id, component_id, chan, msg, gimbal_report->counter, gimbal_report->delta_angle_x, gimbal_report->delta_angle_y, gimbal_report->delta_angle_z, gimbal_report->delta_velocity_x, gimbal_report->delta_velocity_y, gimbal_report->delta_velocity_z, gimbal_report->joint_roll, gimbal_report->joint_pitch, gimbal_report->joint_yaw);
} }
/** /**
@ -198,13 +198,13 @@ static inline uint16_t mavlink_msg_gimbal_report_encode_chan(uint8_t system_id,
* @param delta_velocity_x Delta velocity X, m/s * @param delta_velocity_x Delta velocity X, m/s
* @param delta_velocity_y Delta velocity Y, m/s * @param delta_velocity_y Delta velocity Y, m/s
* @param delta_velocity_z Delta velocity Z, m/s * @param delta_velocity_z Delta velocity Z, m/s
* @param joint_yaw Joint yaw, radians
* @param joint_roll Joint roll, radians * @param joint_roll Joint roll, radians
* @param joint_pitch Joint pitch, radians * @param joint_pitch Joint pitch, radians
* @param joint_yaw Joint yaw, radians
*/ */
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_gimbal_report_send(mavlink_channel_t chan, uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_yaw, float joint_roll, float joint_pitch) static inline void mavlink_msg_gimbal_report_send(mavlink_channel_t chan, uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_roll, float joint_pitch, float joint_yaw)
{ {
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN]; char buf[MAVLINK_MSG_ID_GIMBAL_REPORT_LEN];
@ -215,9 +215,9 @@ static inline void mavlink_msg_gimbal_report_send(mavlink_channel_t chan, uint32
_mav_put_float(buf, 16, delta_velocity_x); _mav_put_float(buf, 16, delta_velocity_x);
_mav_put_float(buf, 20, delta_velocity_y); _mav_put_float(buf, 20, delta_velocity_y);
_mav_put_float(buf, 24, delta_velocity_z); _mav_put_float(buf, 24, delta_velocity_z);
_mav_put_float(buf, 28, joint_yaw); _mav_put_float(buf, 28, joint_roll);
_mav_put_float(buf, 32, joint_roll); _mav_put_float(buf, 32, joint_pitch);
_mav_put_float(buf, 36, joint_pitch); _mav_put_float(buf, 36, joint_yaw);
#if MAVLINK_CRC_EXTRA #if MAVLINK_CRC_EXTRA
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC);
@ -233,9 +233,9 @@ static inline void mavlink_msg_gimbal_report_send(mavlink_channel_t chan, uint32
packet.delta_velocity_x = delta_velocity_x; packet.delta_velocity_x = delta_velocity_x;
packet.delta_velocity_y = delta_velocity_y; packet.delta_velocity_y = delta_velocity_y;
packet.delta_velocity_z = delta_velocity_z; packet.delta_velocity_z = delta_velocity_z;
packet.joint_yaw = joint_yaw;
packet.joint_roll = joint_roll; packet.joint_roll = joint_roll;
packet.joint_pitch = joint_pitch; packet.joint_pitch = joint_pitch;
packet.joint_yaw = joint_yaw;
#if MAVLINK_CRC_EXTRA #if MAVLINK_CRC_EXTRA
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, (const char *)&packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, (const char *)&packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC);
@ -253,7 +253,7 @@ static inline void mavlink_msg_gimbal_report_send(mavlink_channel_t chan, uint32
is usually the receive buffer for the channel, and allows a reply to an is usually the receive buffer for the channel, and allows a reply to an
incoming message with minimum stack space usage. incoming message with minimum stack space usage.
*/ */
static inline void mavlink_msg_gimbal_report_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_yaw, float joint_roll, float joint_pitch) static inline void mavlink_msg_gimbal_report_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t counter, float delta_angle_x, float delta_angle_y, float delta_angle_z, float delta_velocity_x, float delta_velocity_y, float delta_velocity_z, float joint_roll, float joint_pitch, float joint_yaw)
{ {
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf; char *buf = (char *)msgbuf;
@ -264,9 +264,9 @@ static inline void mavlink_msg_gimbal_report_send_buf(mavlink_message_t *msgbuf,
_mav_put_float(buf, 16, delta_velocity_x); _mav_put_float(buf, 16, delta_velocity_x);
_mav_put_float(buf, 20, delta_velocity_y); _mav_put_float(buf, 20, delta_velocity_y);
_mav_put_float(buf, 24, delta_velocity_z); _mav_put_float(buf, 24, delta_velocity_z);
_mav_put_float(buf, 28, joint_yaw); _mav_put_float(buf, 28, joint_roll);
_mav_put_float(buf, 32, joint_roll); _mav_put_float(buf, 32, joint_pitch);
_mav_put_float(buf, 36, joint_pitch); _mav_put_float(buf, 36, joint_yaw);
#if MAVLINK_CRC_EXTRA #if MAVLINK_CRC_EXTRA
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, buf, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC);
@ -282,9 +282,9 @@ static inline void mavlink_msg_gimbal_report_send_buf(mavlink_message_t *msgbuf,
packet->delta_velocity_x = delta_velocity_x; packet->delta_velocity_x = delta_velocity_x;
packet->delta_velocity_y = delta_velocity_y; packet->delta_velocity_y = delta_velocity_y;
packet->delta_velocity_z = delta_velocity_z; packet->delta_velocity_z = delta_velocity_z;
packet->joint_yaw = joint_yaw;
packet->joint_roll = joint_roll; packet->joint_roll = joint_roll;
packet->joint_pitch = joint_pitch; packet->joint_pitch = joint_pitch;
packet->joint_yaw = joint_yaw;
#if MAVLINK_CRC_EXTRA #if MAVLINK_CRC_EXTRA
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, (const char *)packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GIMBAL_REPORT, (const char *)packet, MAVLINK_MSG_ID_GIMBAL_REPORT_LEN, MAVLINK_MSG_ID_GIMBAL_REPORT_CRC);
@ -370,16 +370,6 @@ static inline float mavlink_msg_gimbal_report_get_delta_velocity_z(const mavlink
return _MAV_RETURN_float(msg, 24); return _MAV_RETURN_float(msg, 24);
} }
/**
* @brief Get field joint_yaw from gimbal_report message
*
* @return Joint yaw, radians
*/
static inline float mavlink_msg_gimbal_report_get_joint_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 28);
}
/** /**
* @brief Get field joint_roll from gimbal_report message * @brief Get field joint_roll from gimbal_report message
* *
@ -387,7 +377,7 @@ static inline float mavlink_msg_gimbal_report_get_joint_yaw(const mavlink_messag
*/ */
static inline float mavlink_msg_gimbal_report_get_joint_roll(const mavlink_message_t* msg) static inline float mavlink_msg_gimbal_report_get_joint_roll(const mavlink_message_t* msg)
{ {
return _MAV_RETURN_float(msg, 32); return _MAV_RETURN_float(msg, 28);
} }
/** /**
@ -396,6 +386,16 @@ static inline float mavlink_msg_gimbal_report_get_joint_roll(const mavlink_messa
* @return Joint pitch, radians * @return Joint pitch, radians
*/ */
static inline float mavlink_msg_gimbal_report_get_joint_pitch(const mavlink_message_t* msg) static inline float mavlink_msg_gimbal_report_get_joint_pitch(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 32);
}
/**
* @brief Get field joint_yaw from gimbal_report message
*
* @return Joint yaw, radians
*/
static inline float mavlink_msg_gimbal_report_get_joint_yaw(const mavlink_message_t* msg)
{ {
return _MAV_RETURN_float(msg, 36); return _MAV_RETURN_float(msg, 36);
} }
@ -416,9 +416,9 @@ static inline void mavlink_msg_gimbal_report_decode(const mavlink_message_t* msg
gimbal_report->delta_velocity_x = mavlink_msg_gimbal_report_get_delta_velocity_x(msg); gimbal_report->delta_velocity_x = mavlink_msg_gimbal_report_get_delta_velocity_x(msg);
gimbal_report->delta_velocity_y = mavlink_msg_gimbal_report_get_delta_velocity_y(msg); gimbal_report->delta_velocity_y = mavlink_msg_gimbal_report_get_delta_velocity_y(msg);
gimbal_report->delta_velocity_z = mavlink_msg_gimbal_report_get_delta_velocity_z(msg); gimbal_report->delta_velocity_z = mavlink_msg_gimbal_report_get_delta_velocity_z(msg);
gimbal_report->joint_yaw = mavlink_msg_gimbal_report_get_joint_yaw(msg);
gimbal_report->joint_roll = mavlink_msg_gimbal_report_get_joint_roll(msg); gimbal_report->joint_roll = mavlink_msg_gimbal_report_get_joint_roll(msg);
gimbal_report->joint_pitch = mavlink_msg_gimbal_report_get_joint_pitch(msg); gimbal_report->joint_pitch = mavlink_msg_gimbal_report_get_joint_pitch(msg);
gimbal_report->joint_yaw = mavlink_msg_gimbal_report_get_joint_yaw(msg);
#else #else
memcpy(gimbal_report, _MAV_PAYLOAD(msg), MAVLINK_MSG_ID_GIMBAL_REPORT_LEN); memcpy(gimbal_report, _MAV_PAYLOAD(msg), MAVLINK_MSG_ID_GIMBAL_REPORT_LEN);
#endif #endif

8
libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/testsuite.h
View File

@ -1585,9 +1585,9 @@ static void mavlink_test_gimbal_report(uint8_t system_id, uint8_t component_id,
packet1.delta_velocity_x = packet_in.delta_velocity_x; packet1.delta_velocity_x = packet_in.delta_velocity_x;
packet1.delta_velocity_y = packet_in.delta_velocity_y; packet1.delta_velocity_y = packet_in.delta_velocity_y;
packet1.delta_velocity_z = packet_in.delta_velocity_z; packet1.delta_velocity_z = packet_in.delta_velocity_z;
packet1.joint_yaw = packet_in.joint_yaw;
packet1.joint_roll = packet_in.joint_roll; packet1.joint_roll = packet_in.joint_roll;
packet1.joint_pitch = packet_in.joint_pitch; packet1.joint_pitch = packet_in.joint_pitch;
packet1.joint_yaw = packet_in.joint_yaw;
@ -1597,12 +1597,12 @@ static void mavlink_test_gimbal_report(uint8_t system_id, uint8_t component_id,
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_gimbal_report_pack(system_id, component_id, &msg , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_yaw , packet1.joint_roll , packet1.joint_pitch ); mavlink_msg_gimbal_report_pack(system_id, component_id, &msg , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_roll , packet1.joint_pitch , packet1.joint_yaw );
mavlink_msg_gimbal_report_decode(&msg, &packet2); mavlink_msg_gimbal_report_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_gimbal_report_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_yaw , packet1.joint_roll , packet1.joint_pitch ); mavlink_msg_gimbal_report_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_roll , packet1.joint_pitch , packet1.joint_yaw );
mavlink_msg_gimbal_report_decode(&msg, &packet2); mavlink_msg_gimbal_report_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@ -1615,7 +1615,7 @@ static void mavlink_test_gimbal_report(uint8_t system_id, uint8_t component_id,
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_gimbal_report_send(MAVLINK_COMM_1 , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_yaw , packet1.joint_roll , packet1.joint_pitch ); mavlink_msg_gimbal_report_send(MAVLINK_COMM_1 , packet1.counter , packet1.delta_angle_x , packet1.delta_angle_y , packet1.delta_angle_z , packet1.delta_velocity_x , packet1.delta_velocity_y , packet1.delta_velocity_z , packet1.joint_roll , packet1.joint_pitch , packet1.joint_yaw );
mavlink_msg_gimbal_report_decode(last_msg, &packet2); mavlink_msg_gimbal_report_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
} }

2
libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
View File

@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed Jan 28 14:29:27 2015" #define MAVLINK_BUILD_DATE "Thu Jan 29 08:58:35 2015"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255

2
libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
View File

@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed Jan 28 14:29:32 2015" #define MAVLINK_BUILD_DATE "Thu Jan 29 08:58:40 2015"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255