feat: 更好兼容matlab

uin64->uint32
payload64->payload
This commit is contained in:
matt
2020-09-20 10:12:24 +08:00
parent 1465895353
commit e79d1f21fb
289 changed files with 6428 additions and 15915 deletions
+81 -81
View File
@@ -3,9 +3,9 @@
#define MAVLINK_MSG_ID_CAMERA_STATUS 179
MAVPACKED(
typedef struct __mavlink_camera_status_t {
uint64_t time_usec; /*< [us] Image timestamp (since UNIX epoch, according to camera clock).*/
uint32_t time_usec; /*< [us] Image timestamp (since UNIX epoch, according to camera clock).*/
float p1; /*< Parameter 1 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum).*/
float p2; /*< Parameter 2 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum).*/
float p3; /*< Parameter 3 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum).*/
@@ -14,15 +14,15 @@ typedef struct __mavlink_camera_status_t {
uint8_t target_system; /*< System ID.*/
uint8_t cam_idx; /*< Camera ID.*/
uint8_t event_id; /*< Event type.*/
}) mavlink_camera_status_t;
} mavlink_camera_status_t;
#define MAVLINK_MSG_ID_CAMERA_STATUS_LEN 29
#define MAVLINK_MSG_ID_CAMERA_STATUS_MIN_LEN 29
#define MAVLINK_MSG_ID_179_LEN 29
#define MAVLINK_MSG_ID_179_MIN_LEN 29
#define MAVLINK_MSG_ID_CAMERA_STATUS_LEN 25
#define MAVLINK_MSG_ID_CAMERA_STATUS_MIN_LEN 25
#define MAVLINK_MSG_ID_179_LEN 25
#define MAVLINK_MSG_ID_179_MIN_LEN 25
#define MAVLINK_MSG_ID_CAMERA_STATUS_CRC 189
#define MAVLINK_MSG_ID_179_CRC 189
#define MAVLINK_MSG_ID_CAMERA_STATUS_CRC 252
#define MAVLINK_MSG_ID_179_CRC 252
@@ -31,30 +31,30 @@ typedef struct __mavlink_camera_status_t {
179, \
"CAMERA_STATUS", \
9, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_camera_status_t, time_usec) }, \
{ "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 26, offsetof(mavlink_camera_status_t, target_system) }, \
{ "cam_idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 27, offsetof(mavlink_camera_status_t, cam_idx) }, \
{ "img_idx", NULL, MAVLINK_TYPE_UINT16_T, 0, 24, offsetof(mavlink_camera_status_t, img_idx) }, \
{ "event_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_camera_status_t, event_id) }, \
{ "p1", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_camera_status_t, p1) }, \
{ "p2", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_camera_status_t, p2) }, \
{ "p3", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_camera_status_t, p3) }, \
{ "p4", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_camera_status_t, p4) }, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_camera_status_t, time_usec) }, \
{ "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 22, offsetof(mavlink_camera_status_t, target_system) }, \
{ "cam_idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 23, offsetof(mavlink_camera_status_t, cam_idx) }, \
{ "img_idx", NULL, MAVLINK_TYPE_UINT16_T, 0, 20, offsetof(mavlink_camera_status_t, img_idx) }, \
{ "event_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_camera_status_t, event_id) }, \
{ "p1", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_camera_status_t, p1) }, \
{ "p2", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_camera_status_t, p2) }, \
{ "p3", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_camera_status_t, p3) }, \
{ "p4", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_camera_status_t, p4) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_CAMERA_STATUS { \
"CAMERA_STATUS", \
9, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_camera_status_t, time_usec) }, \
{ "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 26, offsetof(mavlink_camera_status_t, target_system) }, \
{ "cam_idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 27, offsetof(mavlink_camera_status_t, cam_idx) }, \
{ "img_idx", NULL, MAVLINK_TYPE_UINT16_T, 0, 24, offsetof(mavlink_camera_status_t, img_idx) }, \
{ "event_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_camera_status_t, event_id) }, \
{ "p1", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_camera_status_t, p1) }, \
{ "p2", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_camera_status_t, p2) }, \
{ "p3", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_camera_status_t, p3) }, \
{ "p4", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_camera_status_t, p4) }, \
{ { "time_usec", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_camera_status_t, time_usec) }, \
{ "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 22, offsetof(mavlink_camera_status_t, target_system) }, \
{ "cam_idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 23, offsetof(mavlink_camera_status_t, cam_idx) }, \
{ "img_idx", NULL, MAVLINK_TYPE_UINT16_T, 0, 20, offsetof(mavlink_camera_status_t, img_idx) }, \
{ "event_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_camera_status_t, event_id) }, \
{ "p1", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_camera_status_t, p1) }, \
{ "p2", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_camera_status_t, p2) }, \
{ "p3", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_camera_status_t, p3) }, \
{ "p4", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_camera_status_t, p4) }, \
} \
}
#endif
@@ -76,20 +76,20 @@ typedef struct __mavlink_camera_status_t {
* @param p4 Parameter 4 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum).
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_camera_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint64_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
static inline uint16_t mavlink_msg_camera_status_pack(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint32_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CAMERA_STATUS_LEN];
_mav_put_uint64_t(buf, 0, time_usec);
_mav_put_float(buf, 8, p1);
_mav_put_float(buf, 12, p2);
_mav_put_float(buf, 16, p3);
_mav_put_float(buf, 20, p4);
_mav_put_uint16_t(buf, 24, img_idx);
_mav_put_uint8_t(buf, 26, target_system);
_mav_put_uint8_t(buf, 27, cam_idx);
_mav_put_uint8_t(buf, 28, event_id);
_mav_put_uint32_t(buf, 0, time_usec);
_mav_put_float(buf, 4, p1);
_mav_put_float(buf, 8, p2);
_mav_put_float(buf, 12, p3);
_mav_put_float(buf, 16, p4);
_mav_put_uint16_t(buf, 20, img_idx);
_mav_put_uint8_t(buf, 22, target_system);
_mav_put_uint8_t(buf, 23, cam_idx);
_mav_put_uint8_t(buf, 24, event_id);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CAMERA_STATUS_LEN);
#else
@@ -128,21 +128,21 @@ static inline uint16_t mavlink_msg_camera_status_pack(uint8_t system_id, uint8_t
* @param p4 Parameter 4 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum).
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_camera_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
static inline uint16_t mavlink_msg_camera_status_pack_chan(uint16_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
uint64_t time_usec,uint8_t target_system,uint8_t cam_idx,uint16_t img_idx,uint8_t event_id,float p1,float p2,float p3,float p4)
uint32_t time_usec,uint8_t target_system,uint8_t cam_idx,uint16_t img_idx,uint8_t event_id,float p1,float p2,float p3,float p4)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CAMERA_STATUS_LEN];
_mav_put_uint64_t(buf, 0, time_usec);
_mav_put_float(buf, 8, p1);
_mav_put_float(buf, 12, p2);
_mav_put_float(buf, 16, p3);
_mav_put_float(buf, 20, p4);
_mav_put_uint16_t(buf, 24, img_idx);
_mav_put_uint8_t(buf, 26, target_system);
_mav_put_uint8_t(buf, 27, cam_idx);
_mav_put_uint8_t(buf, 28, event_id);
_mav_put_uint32_t(buf, 0, time_usec);
_mav_put_float(buf, 4, p1);
_mav_put_float(buf, 8, p2);
_mav_put_float(buf, 12, p3);
_mav_put_float(buf, 16, p4);
_mav_put_uint16_t(buf, 20, img_idx);
_mav_put_uint8_t(buf, 22, target_system);
_mav_put_uint8_t(buf, 23, cam_idx);
_mav_put_uint8_t(buf, 24, event_id);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CAMERA_STATUS_LEN);
#else
@@ -172,7 +172,7 @@ static inline uint16_t mavlink_msg_camera_status_pack_chan(uint8_t system_id, ui
* @param msg The MAVLink message to compress the data into
* @param camera_status C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_camera_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_camera_status_t* camera_status)
static inline uint16_t mavlink_msg_camera_status_encode(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_camera_status_t* camera_status)
{
return mavlink_msg_camera_status_pack(system_id, component_id, msg, camera_status->time_usec, camera_status->target_system, camera_status->cam_idx, camera_status->img_idx, camera_status->event_id, camera_status->p1, camera_status->p2, camera_status->p3, camera_status->p4);
}
@@ -186,7 +186,7 @@ static inline uint16_t mavlink_msg_camera_status_encode(uint8_t system_id, uint8
* @param msg The MAVLink message to compress the data into
* @param camera_status C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_camera_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_camera_status_t* camera_status)
static inline uint16_t mavlink_msg_camera_status_encode_chan(uint16_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_camera_status_t* camera_status)
{
return mavlink_msg_camera_status_pack_chan(system_id, component_id, chan, msg, camera_status->time_usec, camera_status->target_system, camera_status->cam_idx, camera_status->img_idx, camera_status->event_id, camera_status->p1, camera_status->p2, camera_status->p3, camera_status->p4);
}
@@ -207,19 +207,19 @@ static inline uint16_t mavlink_msg_camera_status_encode_chan(uint8_t system_id,
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_camera_status_send(mavlink_channel_t chan, uint64_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
static inline void mavlink_msg_camera_status_send(mavlink_channel_t chan, uint32_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CAMERA_STATUS_LEN];
_mav_put_uint64_t(buf, 0, time_usec);
_mav_put_float(buf, 8, p1);
_mav_put_float(buf, 12, p2);
_mav_put_float(buf, 16, p3);
_mav_put_float(buf, 20, p4);
_mav_put_uint16_t(buf, 24, img_idx);
_mav_put_uint8_t(buf, 26, target_system);
_mav_put_uint8_t(buf, 27, cam_idx);
_mav_put_uint8_t(buf, 28, event_id);
_mav_put_uint32_t(buf, 0, time_usec);
_mav_put_float(buf, 4, p1);
_mav_put_float(buf, 8, p2);
_mav_put_float(buf, 12, p3);
_mav_put_float(buf, 16, p4);
_mav_put_uint16_t(buf, 20, img_idx);
_mav_put_uint8_t(buf, 22, target_system);
_mav_put_uint8_t(buf, 23, cam_idx);
_mav_put_uint8_t(buf, 24, event_id);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CAMERA_STATUS, buf, MAVLINK_MSG_ID_CAMERA_STATUS_MIN_LEN, MAVLINK_MSG_ID_CAMERA_STATUS_LEN, MAVLINK_MSG_ID_CAMERA_STATUS_CRC);
#else
@@ -260,19 +260,19 @@ static inline void mavlink_msg_camera_status_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_camera_status_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
static inline void mavlink_msg_camera_status_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t time_usec, uint8_t target_system, uint8_t cam_idx, uint16_t img_idx, uint8_t event_id, float p1, float p2, float p3, float p4)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
_mav_put_uint64_t(buf, 0, time_usec);
_mav_put_float(buf, 8, p1);
_mav_put_float(buf, 12, p2);
_mav_put_float(buf, 16, p3);
_mav_put_float(buf, 20, p4);
_mav_put_uint16_t(buf, 24, img_idx);
_mav_put_uint8_t(buf, 26, target_system);
_mav_put_uint8_t(buf, 27, cam_idx);
_mav_put_uint8_t(buf, 28, event_id);
_mav_put_uint32_t(buf, 0, time_usec);
_mav_put_float(buf, 4, p1);
_mav_put_float(buf, 8, p2);
_mav_put_float(buf, 12, p3);
_mav_put_float(buf, 16, p4);
_mav_put_uint16_t(buf, 20, img_idx);
_mav_put_uint8_t(buf, 22, target_system);
_mav_put_uint8_t(buf, 23, cam_idx);
_mav_put_uint8_t(buf, 24, event_id);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CAMERA_STATUS, buf, MAVLINK_MSG_ID_CAMERA_STATUS_MIN_LEN, MAVLINK_MSG_ID_CAMERA_STATUS_LEN, MAVLINK_MSG_ID_CAMERA_STATUS_CRC);
#else
@@ -302,9 +302,9 @@ static inline void mavlink_msg_camera_status_send_buf(mavlink_message_t *msgbuf,
*
* @return [us] Image timestamp (since UNIX epoch, according to camera clock).
*/
static inline uint64_t mavlink_msg_camera_status_get_time_usec(const mavlink_message_t* msg)
static inline uint32_t mavlink_msg_camera_status_get_time_usec(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint64_t(msg, 0);
return _MAV_RETURN_uint32_t(msg, 0);
}
/**
@@ -314,7 +314,7 @@ static inline uint64_t mavlink_msg_camera_status_get_time_usec(const mavlink_mes
*/
static inline uint8_t mavlink_msg_camera_status_get_target_system(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 26);
return _MAV_RETURN_uint8_t(msg, 22);
}
/**
@@ -324,7 +324,7 @@ static inline uint8_t mavlink_msg_camera_status_get_target_system(const mavlink_
*/
static inline uint8_t mavlink_msg_camera_status_get_cam_idx(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 27);
return _MAV_RETURN_uint8_t(msg, 23);
}
/**
@@ -334,7 +334,7 @@ static inline uint8_t mavlink_msg_camera_status_get_cam_idx(const mavlink_messag
*/
static inline uint16_t mavlink_msg_camera_status_get_img_idx(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 24);
return _MAV_RETURN_uint16_t(msg, 20);
}
/**
@@ -344,7 +344,7 @@ static inline uint16_t mavlink_msg_camera_status_get_img_idx(const mavlink_messa
*/
static inline uint8_t mavlink_msg_camera_status_get_event_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 28);
return _MAV_RETURN_uint8_t(msg, 24);
}
/**
@@ -354,7 +354,7 @@ static inline uint8_t mavlink_msg_camera_status_get_event_id(const mavlink_messa
*/
static inline float mavlink_msg_camera_status_get_p1(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
return _MAV_RETURN_float(msg, 4);
}
/**
@@ -364,7 +364,7 @@ static inline float mavlink_msg_camera_status_get_p1(const mavlink_message_t* ms
*/
static inline float mavlink_msg_camera_status_get_p2(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
return _MAV_RETURN_float(msg, 8);
}
/**
@@ -374,7 +374,7 @@ static inline float mavlink_msg_camera_status_get_p2(const mavlink_message_t* ms
*/
static inline float mavlink_msg_camera_status_get_p3(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
return _MAV_RETURN_float(msg, 12);
}
/**
@@ -384,7 +384,7 @@ static inline float mavlink_msg_camera_status_get_p3(const mavlink_message_t* ms
*/
static inline float mavlink_msg_camera_status_get_p4(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
return _MAV_RETURN_float(msg, 16);
}
/**