hm/c_library_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pymavlink and generate again

Browse Source
This commit is contained in:
Matthew Gong
2018-04-29 09:33:02 +08:00
parent 5eb43f646a
commit fe1bed229c
31 changed files with 943 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/mavlink_msg_landing_target.h
+20 -162
View File
@@ -13,29 +13,23 @@ typedef struct __mavlink_landing_target_t {
float size_y; /*< Size in radians of target along y-axis*/
uint8_t target_num; /*< The ID of the target if multiple targets are present*/
uint8_t frame; /*< MAV_FRAME enum specifying the whether the following feilds are earth-frame, body-frame, etc.*/
float x; /*< X Position of the landing target on MAV_FRAME*/
float y; /*< Y Position of the landing target on MAV_FRAME*/
float z; /*< Z Position of the landing target on MAV_FRAME*/
float q[4]; /*< Quaternion of landing target orientation (w, x, y, z order, zero-rotation is 1, 0, 0, 0)*/
uint8_t type; /*< LANDING_TARGET_TYPE enum specifying the type of landing target*/
uint8_t position_valid; /*< Boolean indicating known position (1) or default unkown position (0), for validation of positioning of the landing target*/
}) mavlink_landing_target_t;
#define MAVLINK_MSG_ID_LANDING_TARGET_LEN 60
#define MAVLINK_MSG_ID_LANDING_TARGET_LEN 30
#define MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN 30
#define MAVLINK_MSG_ID_149_LEN 60
#define MAVLINK_MSG_ID_149_LEN 30
#define MAVLINK_MSG_ID_149_MIN_LEN 30
#define MAVLINK_MSG_ID_LANDING_TARGET_CRC 200
#define MAVLINK_MSG_ID_149_CRC 200
#define MAVLINK_MSG_LANDING_TARGET_FIELD_Q_LEN 4
#if MAVLINK_COMMAND_24BIT
#define MAVLINK_MESSAGE_INFO_LANDING_TARGET { \
149, \
"LANDING_TARGET", \
14, \
8, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_landing_target_t, time_usec) }, \
{ "target_num", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_landing_target_t, target_num) }, \
{ "frame", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_landing_target_t, frame) }, \
@@ -44,18 +38,12 @@ typedef struct __mavlink_landing_target_t {
{ "distance", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_landing_target_t, distance) }, \
{ "size_x", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_landing_target_t, size_x) }, \
{ "size_y", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_landing_target_t, size_y) }, \
{ "x", NULL, MAVLINK_TYPE_FLOAT, 0, 30, offsetof(mavlink_landing_target_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 34, offsetof(mavlink_landing_target_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 38, offsetof(mavlink_landing_target_t, z) }, \
{ "q", NULL, MAVLINK_TYPE_FLOAT, 4, 42, offsetof(mavlink_landing_target_t, q) }, \
{ "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 58, offsetof(mavlink_landing_target_t, type) }, \
{ "position_valid", NULL, MAVLINK_TYPE_UINT8_T, 0, 59, offsetof(mavlink_landing_target_t, position_valid) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_LANDING_TARGET { \
"LANDING_TARGET", \
14, \
8, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_landing_target_t, time_usec) }, \
{ "target_num", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_landing_target_t, target_num) }, \
{ "frame", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_landing_target_t, frame) }, \
@@ -64,12 +52,6 @@ typedef struct __mavlink_landing_target_t {
{ "distance", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_landing_target_t, distance) }, \
{ "size_x", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_landing_target_t, size_x) }, \
{ "size_y", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_landing_target_t, size_y) }, \
{ "x", NULL, MAVLINK_TYPE_FLOAT, 0, 30, offsetof(mavlink_landing_target_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 34, offsetof(mavlink_landing_target_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 38, offsetof(mavlink_landing_target_t, z) }, \
{ "q", NULL, MAVLINK_TYPE_FLOAT, 4, 42, offsetof(mavlink_landing_target_t, q) }, \
{ "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 58, offsetof(mavlink_landing_target_t, type) }, \
{ "position_valid", NULL, MAVLINK_TYPE_UINT8_T, 0, 59, offsetof(mavlink_landing_target_t, position_valid) }, \
} \
}
#endif
@@ -88,16 +70,10 @@ typedef struct __mavlink_landing_target_t {
* @param distance Distance to the target from the vehicle in meters
* @param size_x Size in radians of target along x-axis
* @param size_y Size in radians of target along y-axis
* @param x X Position of the landing target on MAV_FRAME
* @param y Y Position of the landing target on MAV_FRAME
* @param z Z Position of the landing target on MAV_FRAME
* @param q Quaternion of landing target orientation (w, x, y, z order, zero-rotation is 1, 0, 0, 0)
* @param type LANDING_TARGET_TYPE enum specifying the type of landing target
* @param position_valid Boolean indicating known position (1) or default unkown position (0), for validation of positioning of the landing target
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_landing_target_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y, float x, float y, float z, const float *q, uint8_t type, uint8_t position_valid)
uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_LANDING_TARGET_LEN];
@@ -109,12 +85,7 @@ static inline uint16_t mavlink_msg_landing_target_pack(uint8_t system_id, uint8_
_mav_put_float(buf, 24, size_y);
_mav_put_uint8_t(buf, 28, target_num);
_mav_put_uint8_t(buf, 29, frame);
_mav_put_float(buf, 30, x);
_mav_put_float(buf, 34, y);
_mav_put_float(buf, 38, z);
_mav_put_uint8_t(buf, 58, type);
_mav_put_uint8_t(buf, 59, position_valid);
_mav_put_float_array(buf, 42, q, 4);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_LANDING_TARGET_LEN);
#else
mavlink_landing_target_t packet;
@@ -126,12 +97,7 @@ static inline uint16_t mavlink_msg_landing_target_pack(uint8_t system_id, uint8_
packet.size_y = size_y;
packet.target_num = target_num;
packet.frame = frame;
packet.x = x;
packet.y = y;
packet.z = z;
packet.type = type;
packet.position_valid = position_valid;
mav_array_memcpy(packet.q, q, sizeof(float)*4);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_LANDING_TARGET_LEN);
#endif
@@ -153,17 +119,11 @@ static inline uint16_t mavlink_msg_landing_target_pack(uint8_t system_id, uint8_
* @param distance Distance to the target from the vehicle in meters
* @param size_x Size in radians of target along x-axis
* @param size_y Size in radians of target along y-axis
* @param x X Position of the landing target on MAV_FRAME
* @param y Y Position of the landing target on MAV_FRAME
* @param z Z Position of the landing target on MAV_FRAME
* @param q Quaternion of landing target orientation (w, x, y, z order, zero-rotation is 1, 0, 0, 0)
* @param type LANDING_TARGET_TYPE enum specifying the type of landing target
* @param position_valid Boolean indicating known position (1) or default unkown position (0), for validation of positioning of the landing target
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_landing_target_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
uint64_t time_usec,uint8_t target_num,uint8_t frame,float angle_x,float angle_y,float distance,float size_x,float size_y,float x,float y,float z,const float *q,uint8_t type,uint8_t position_valid)
uint64_t time_usec,uint8_t target_num,uint8_t frame,float angle_x,float angle_y,float distance,float size_x,float size_y)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_LANDING_TARGET_LEN];
@@ -175,12 +135,7 @@ static inline uint16_t mavlink_msg_landing_target_pack_chan(uint8_t system_id, u
_mav_put_float(buf, 24, size_y);
_mav_put_uint8_t(buf, 28, target_num);
_mav_put_uint8_t(buf, 29, frame);
_mav_put_float(buf, 30, x);
_mav_put_float(buf, 34, y);
_mav_put_float(buf, 38, z);
_mav_put_uint8_t(buf, 58, type);
_mav_put_uint8_t(buf, 59, position_valid);
_mav_put_float_array(buf, 42, q, 4);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_LANDING_TARGET_LEN);
#else
mavlink_landing_target_t packet;
@@ -192,12 +147,7 @@ static inline uint16_t mavlink_msg_landing_target_pack_chan(uint8_t system_id, u
packet.size_y = size_y;
packet.target_num = target_num;
packet.frame = frame;
packet.x = x;
packet.y = y;
packet.z = z;
packet.type = type;
packet.position_valid = position_valid;
mav_array_memcpy(packet.q, q, sizeof(float)*4);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_LANDING_TARGET_LEN);
#endif
@@ -215,7 +165,7 @@ static inline uint16_t mavlink_msg_landing_target_pack_chan(uint8_t system_id, u
*/
static inline uint16_t mavlink_msg_landing_target_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_landing_target_t* landing_target)
{
return mavlink_msg_landing_target_pack(system_id, component_id, msg, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y, landing_target->x, landing_target->y, landing_target->z, landing_target->q, landing_target->type, landing_target->position_valid);
return mavlink_msg_landing_target_pack(system_id, component_id, msg, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y);
}
/**
@@ -229,7 +179,7 @@ static inline uint16_t mavlink_msg_landing_target_encode(uint8_t system_id, uint
*/
static inline uint16_t mavlink_msg_landing_target_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_landing_target_t* landing_target)
{
return mavlink_msg_landing_target_pack_chan(system_id, component_id, chan, msg, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y, landing_target->x, landing_target->y, landing_target->z, landing_target->q, landing_target->type, landing_target->position_valid);
return mavlink_msg_landing_target_pack_chan(system_id, component_id, chan, msg, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y);
}
/**
@@ -244,16 +194,10 @@ static inline uint16_t mavlink_msg_landing_target_encode_chan(uint8_t system_id,
* @param distance Distance to the target from the vehicle in meters
* @param size_x Size in radians of target along x-axis
* @param size_y Size in radians of target along y-axis
* @param x X Position of the landing target on MAV_FRAME
* @param y Y Position of the landing target on MAV_FRAME
* @param z Z Position of the landing target on MAV_FRAME
* @param q Quaternion of landing target orientation (w, x, y, z order, zero-rotation is 1, 0, 0, 0)
* @param type LANDING_TARGET_TYPE enum specifying the type of landing target
* @param position_valid Boolean indicating known position (1) or default unkown position (0), for validation of positioning of the landing target
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_landing_target_send(mavlink_channel_t chan, uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y, float x, float y, float z, const float *q, uint8_t type, uint8_t position_valid)
static inline void mavlink_msg_landing_target_send(mavlink_channel_t chan, uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_LANDING_TARGET_LEN];
@@ -265,12 +209,7 @@ static inline void mavlink_msg_landing_target_send(mavlink_channel_t chan, uint6
_mav_put_float(buf, 24, size_y);
_mav_put_uint8_t(buf, 28, target_num);
_mav_put_uint8_t(buf, 29, frame);
_mav_put_float(buf, 30, x);
_mav_put_float(buf, 34, y);
_mav_put_float(buf, 38, z);
_mav_put_uint8_t(buf, 58, type);
_mav_put_uint8_t(buf, 59, position_valid);
_mav_put_float_array(buf, 42, q, 4);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LANDING_TARGET, buf, MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN, MAVLINK_MSG_ID_LANDING_TARGET_LEN, MAVLINK_MSG_ID_LANDING_TARGET_CRC);
#else
mavlink_landing_target_t packet;
@@ -282,12 +221,7 @@ static inline void mavlink_msg_landing_target_send(mavlink_channel_t chan, uint6
packet.size_y = size_y;
packet.target_num = target_num;
packet.frame = frame;
packet.x = x;
packet.y = y;
packet.z = z;
packet.type = type;
packet.position_valid = position_valid;
mav_array_memcpy(packet.q, q, sizeof(float)*4);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LANDING_TARGET, (const char *)&packet, MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN, MAVLINK_MSG_ID_LANDING_TARGET_LEN, MAVLINK_MSG_ID_LANDING_TARGET_CRC);
#endif
}
@@ -300,7 +234,7 @@ static inline void mavlink_msg_landing_target_send(mavlink_channel_t chan, uint6
static inline void mavlink_msg_landing_target_send_struct(mavlink_channel_t chan, const mavlink_landing_target_t* landing_target)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
mavlink_msg_landing_target_send(chan, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y, landing_target->x, landing_target->y, landing_target->z, landing_target->q, landing_target->type, landing_target->position_valid);
mavlink_msg_landing_target_send(chan, landing_target->time_usec, landing_target->target_num, landing_target->frame, landing_target->angle_x, landing_target->angle_y, landing_target->distance, landing_target->size_x, landing_target->size_y);
#else
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LANDING_TARGET, (const char *)landing_target, MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN, MAVLINK_MSG_ID_LANDING_TARGET_LEN, MAVLINK_MSG_ID_LANDING_TARGET_CRC);
#endif
@@ -314,7 +248,7 @@ static inline void mavlink_msg_landing_target_send_struct(mavlink_channel_t chan
is usually the receive buffer for the channel, and allows a reply to an
incoming message with minimum stack space usage.
*/
static inline void mavlink_msg_landing_target_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y, float x, float y, float z, const float *q, uint8_t type, uint8_t position_valid)
static inline void mavlink_msg_landing_target_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t time_usec, uint8_t target_num, uint8_t frame, float angle_x, float angle_y, float distance, float size_x, float size_y)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
@@ -326,12 +260,7 @@ static inline void mavlink_msg_landing_target_send_buf(mavlink_message_t *msgbuf
_mav_put_float(buf, 24, size_y);
_mav_put_uint8_t(buf, 28, target_num);
_mav_put_uint8_t(buf, 29, frame);
_mav_put_float(buf, 30, x);
_mav_put_float(buf, 34, y);
_mav_put_float(buf, 38, z);
_mav_put_uint8_t(buf, 58, type);
_mav_put_uint8_t(buf, 59, position_valid);
_mav_put_float_array(buf, 42, q, 4);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LANDING_TARGET, buf, MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN, MAVLINK_MSG_ID_LANDING_TARGET_LEN, MAVLINK_MSG_ID_LANDING_TARGET_CRC);
#else
mavlink_landing_target_t *packet = (mavlink_landing_target_t *)msgbuf;
@@ -343,12 +272,7 @@ static inline void mavlink_msg_landing_target_send_buf(mavlink_message_t *msgbuf
packet->size_y = size_y;
packet->target_num = target_num;
packet->frame = frame;
packet->x = x;
packet->y = y;
packet->z = z;
packet->type = type;
packet->position_valid = position_valid;
mav_array_memcpy(packet->q, q, sizeof(float)*4);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_LANDING_TARGET, (const char *)packet, MAVLINK_MSG_ID_LANDING_TARGET_MIN_LEN, MAVLINK_MSG_ID_LANDING_TARGET_LEN, MAVLINK_MSG_ID_LANDING_TARGET_CRC);
#endif
}
@@ -439,66 +363,6 @@ static inline float mavlink_msg_landing_target_get_size_y(const mavlink_message_
return _MAV_RETURN_float(msg, 24);
}
/**
* @brief Get field x from landing_target message
*
* @return X Position of the landing target on MAV_FRAME
*/
static inline float mavlink_msg_landing_target_get_x(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 30);
}
/**
* @brief Get field y from landing_target message
*
* @return Y Position of the landing target on MAV_FRAME
*/
static inline float mavlink_msg_landing_target_get_y(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 34);
}
/**
* @brief Get field z from landing_target message
*
* @return Z Position of the landing target on MAV_FRAME
*/
static inline float mavlink_msg_landing_target_get_z(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 38);
}
/**
* @brief Get field q from landing_target message
*
* @return Quaternion of landing target orientation (w, x, y, z order, zero-rotation is 1, 0, 0, 0)
*/
static inline uint16_t mavlink_msg_landing_target_get_q(const mavlink_message_t* msg, float *q)
{
return _MAV_RETURN_float_array(msg, q, 4, 42);
}
/**
* @brief Get field type from landing_target message
*
* @return LANDING_TARGET_TYPE enum specifying the type of landing target
*/
static inline uint8_t mavlink_msg_landing_target_get_type(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 58);
}
/**
* @brief Get field position_valid from landing_target message
*
* @return Boolean indicating known position (1) or default unkown position (0), for validation of positioning of the landing target
*/
static inline uint8_t mavlink_msg_landing_target_get_position_valid(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 59);
}
/**
* @brief Decode a landing_target message into a struct
*
@@ -516,12 +380,6 @@ static inline void mavlink_msg_landing_target_decode(const mavlink_message_t* ms
landing_target->size_y = mavlink_msg_landing_target_get_size_y(msg);
landing_target->target_num = mavlink_msg_landing_target_get_target_num(msg);
landing_target->frame = mavlink_msg_landing_target_get_frame(msg);
landing_target->x = mavlink_msg_landing_target_get_x(msg);
landing_target->y = mavlink_msg_landing_target_get_y(msg);
landing_target->z = mavlink_msg_landing_target_get_z(msg);
mavlink_msg_landing_target_get_q(msg, landing_target->q);
landing_target->type = mavlink_msg_landing_target_get_type(msg);
landing_target->position_valid = mavlink_msg_landing_target_get_position_valid(msg);
#else
uint8_t len = msg->len < MAVLINK_MSG_ID_LANDING_TARGET_LEN? msg->len : MAVLINK_MSG_ID_LANDING_TARGET_LEN;
memset(landing_target, 0, MAVLINK_MSG_ID_LANDING_TARGET_LEN);