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
+55 -55
View File
@@ -3,21 +3,21 @@
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION 264
MAVPACKED(
typedef struct __mavlink_flight_information_t {
uint64_t arming_time_utc; /*< [us] Timestamp at arming (time since UNIX epoch) in UTC, 0 for unknown*/
uint64_t takeoff_time_utc; /*< [us] Timestamp at takeoff (time since UNIX epoch) in UTC, 0 for unknown*/
uint64_t flight_uuid; /*< Universally unique identifier (UUID) of flight, should correspond to name of log files*/
uint32_t time_boot_ms; /*< [ms] Timestamp (time since system boot).*/
}) mavlink_flight_information_t;
uint32_t arming_time_utc; /*< [us] Timestamp at arming (time since UNIX epoch) in UTC, 0 for unknown*/
uint32_t takeoff_time_utc; /*< [us] Timestamp at takeoff (time since UNIX epoch) in UTC, 0 for unknown*/
uint32_t flight_uuid; /*< Universally unique identifier (UUID) of flight, should correspond to name of log files*/
} mavlink_flight_information_t;
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN 28
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN 28
#define MAVLINK_MSG_ID_264_LEN 28
#define MAVLINK_MSG_ID_264_MIN_LEN 28
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN 16
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN 16
#define MAVLINK_MSG_ID_264_LEN 16
#define MAVLINK_MSG_ID_264_MIN_LEN 16
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC 49
#define MAVLINK_MSG_ID_264_CRC 49
#define MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC 103
#define MAVLINK_MSG_ID_264_CRC 103
@@ -26,20 +26,20 @@ typedef struct __mavlink_flight_information_t {
264, \
"FLIGHT_INFORMATION", \
4, \
{ { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 24, offsetof(mavlink_flight_information_t, time_boot_ms) }, \
{ "arming_time_utc", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_flight_information_t, arming_time_utc) }, \
{ "takeoff_time_utc", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_flight_information_t, takeoff_time_utc) }, \
{ "flight_uuid", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_flight_information_t, flight_uuid) }, \
{ { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_flight_information_t, time_boot_ms) }, \
{ "arming_time_utc", NULL, MAVLINK_TYPE_UINT32_T, 0, 4, offsetof(mavlink_flight_information_t, arming_time_utc) }, \
{ "takeoff_time_utc", NULL, MAVLINK_TYPE_UINT32_T, 0, 8, offsetof(mavlink_flight_information_t, takeoff_time_utc) }, \
{ "flight_uuid", NULL, MAVLINK_TYPE_UINT32_T, 0, 12, offsetof(mavlink_flight_information_t, flight_uuid) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_FLIGHT_INFORMATION { \
"FLIGHT_INFORMATION", \
4, \
{ { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 24, offsetof(mavlink_flight_information_t, time_boot_ms) }, \
{ "arming_time_utc", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_flight_information_t, arming_time_utc) }, \
{ "takeoff_time_utc", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_flight_information_t, takeoff_time_utc) }, \
{ "flight_uuid", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_flight_information_t, flight_uuid) }, \
{ { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_flight_information_t, time_boot_ms) }, \
{ "arming_time_utc", NULL, MAVLINK_TYPE_UINT32_T, 0, 4, offsetof(mavlink_flight_information_t, arming_time_utc) }, \
{ "takeoff_time_utc", NULL, MAVLINK_TYPE_UINT32_T, 0, 8, offsetof(mavlink_flight_information_t, takeoff_time_utc) }, \
{ "flight_uuid", NULL, MAVLINK_TYPE_UINT32_T, 0, 12, offsetof(mavlink_flight_information_t, flight_uuid) }, \
} \
}
#endif
@@ -56,23 +56,23 @@ typedef struct __mavlink_flight_information_t {
* @param flight_uuid Universally unique identifier (UUID) of flight, should correspond to name of log files
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_flight_information_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint32_t time_boot_ms, uint64_t arming_time_utc, uint64_t takeoff_time_utc, uint64_t flight_uuid)
static inline uint16_t mavlink_msg_flight_information_pack(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint32_t time_boot_ms, uint32_t arming_time_utc, uint32_t takeoff_time_utc, uint32_t flight_uuid)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN];
_mav_put_uint64_t(buf, 0, arming_time_utc);
_mav_put_uint64_t(buf, 8, takeoff_time_utc);
_mav_put_uint64_t(buf, 16, flight_uuid);
_mav_put_uint32_t(buf, 24, time_boot_ms);
_mav_put_uint32_t(buf, 0, time_boot_ms);
_mav_put_uint32_t(buf, 4, arming_time_utc);
_mav_put_uint32_t(buf, 8, takeoff_time_utc);
_mav_put_uint32_t(buf, 12, flight_uuid);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN);
#else
mavlink_flight_information_t packet;
packet.time_boot_ms = time_boot_ms;
packet.arming_time_utc = arming_time_utc;
packet.takeoff_time_utc = takeoff_time_utc;
packet.flight_uuid = flight_uuid;
packet.time_boot_ms = time_boot_ms;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN);
#endif
@@ -93,24 +93,24 @@ static inline uint16_t mavlink_msg_flight_information_pack(uint8_t system_id, ui
* @param flight_uuid Universally unique identifier (UUID) of flight, should correspond to name of log files
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_flight_information_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
static inline uint16_t mavlink_msg_flight_information_pack_chan(uint16_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
uint32_t time_boot_ms,uint64_t arming_time_utc,uint64_t takeoff_time_utc,uint64_t flight_uuid)
uint32_t time_boot_ms,uint32_t arming_time_utc,uint32_t takeoff_time_utc,uint32_t flight_uuid)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN];
_mav_put_uint64_t(buf, 0, arming_time_utc);
_mav_put_uint64_t(buf, 8, takeoff_time_utc);
_mav_put_uint64_t(buf, 16, flight_uuid);
_mav_put_uint32_t(buf, 24, time_boot_ms);
_mav_put_uint32_t(buf, 0, time_boot_ms);
_mav_put_uint32_t(buf, 4, arming_time_utc);
_mav_put_uint32_t(buf, 8, takeoff_time_utc);
_mav_put_uint32_t(buf, 12, flight_uuid);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN);
#else
mavlink_flight_information_t packet;
packet.time_boot_ms = time_boot_ms;
packet.arming_time_utc = arming_time_utc;
packet.takeoff_time_utc = takeoff_time_utc;
packet.flight_uuid = flight_uuid;
packet.time_boot_ms = time_boot_ms;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN);
#endif
@@ -127,7 +127,7 @@ static inline uint16_t mavlink_msg_flight_information_pack_chan(uint8_t system_i
* @param msg The MAVLink message to compress the data into
* @param flight_information C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_flight_information_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_flight_information_t* flight_information)
static inline uint16_t mavlink_msg_flight_information_encode(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_flight_information_t* flight_information)
{
return mavlink_msg_flight_information_pack(system_id, component_id, msg, flight_information->time_boot_ms, flight_information->arming_time_utc, flight_information->takeoff_time_utc, flight_information->flight_uuid);
}
@@ -141,7 +141,7 @@ static inline uint16_t mavlink_msg_flight_information_encode(uint8_t system_id,
* @param msg The MAVLink message to compress the data into
* @param flight_information C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_flight_information_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_flight_information_t* flight_information)
static inline uint16_t mavlink_msg_flight_information_encode_chan(uint16_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_flight_information_t* flight_information)
{
return mavlink_msg_flight_information_pack_chan(system_id, component_id, chan, msg, flight_information->time_boot_ms, flight_information->arming_time_utc, flight_information->takeoff_time_utc, flight_information->flight_uuid);
}
@@ -157,22 +157,22 @@ static inline uint16_t mavlink_msg_flight_information_encode_chan(uint8_t system
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_flight_information_send(mavlink_channel_t chan, uint32_t time_boot_ms, uint64_t arming_time_utc, uint64_t takeoff_time_utc, uint64_t flight_uuid)
static inline void mavlink_msg_flight_information_send(mavlink_channel_t chan, uint32_t time_boot_ms, uint32_t arming_time_utc, uint32_t takeoff_time_utc, uint32_t flight_uuid)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN];
_mav_put_uint64_t(buf, 0, arming_time_utc);
_mav_put_uint64_t(buf, 8, takeoff_time_utc);
_mav_put_uint64_t(buf, 16, flight_uuid);
_mav_put_uint32_t(buf, 24, time_boot_ms);
_mav_put_uint32_t(buf, 0, time_boot_ms);
_mav_put_uint32_t(buf, 4, arming_time_utc);
_mav_put_uint32_t(buf, 8, takeoff_time_utc);
_mav_put_uint32_t(buf, 12, flight_uuid);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FLIGHT_INFORMATION, buf, MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC);
#else
mavlink_flight_information_t packet;
packet.time_boot_ms = time_boot_ms;
packet.arming_time_utc = arming_time_utc;
packet.takeoff_time_utc = takeoff_time_utc;
packet.flight_uuid = flight_uuid;
packet.time_boot_ms = time_boot_ms;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FLIGHT_INFORMATION, (const char *)&packet, MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC);
#endif
@@ -200,22 +200,22 @@ static inline void mavlink_msg_flight_information_send_struct(mavlink_channel_t
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_flight_information_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t time_boot_ms, uint64_t arming_time_utc, uint64_t takeoff_time_utc, uint64_t flight_uuid)
static inline void mavlink_msg_flight_information_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t time_boot_ms, uint32_t arming_time_utc, uint32_t takeoff_time_utc, uint32_t flight_uuid)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
_mav_put_uint64_t(buf, 0, arming_time_utc);
_mav_put_uint64_t(buf, 8, takeoff_time_utc);
_mav_put_uint64_t(buf, 16, flight_uuid);
_mav_put_uint32_t(buf, 24, time_boot_ms);
_mav_put_uint32_t(buf, 0, time_boot_ms);
_mav_put_uint32_t(buf, 4, arming_time_utc);
_mav_put_uint32_t(buf, 8, takeoff_time_utc);
_mav_put_uint32_t(buf, 12, flight_uuid);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FLIGHT_INFORMATION, buf, MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC);
#else
mavlink_flight_information_t *packet = (mavlink_flight_information_t *)msgbuf;
packet->time_boot_ms = time_boot_ms;
packet->arming_time_utc = arming_time_utc;
packet->takeoff_time_utc = takeoff_time_utc;
packet->flight_uuid = flight_uuid;
packet->time_boot_ms = time_boot_ms;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FLIGHT_INFORMATION, (const char *)packet, MAVLINK_MSG_ID_FLIGHT_INFORMATION_MIN_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN, MAVLINK_MSG_ID_FLIGHT_INFORMATION_CRC);
#endif
@@ -234,7 +234,7 @@ static inline void mavlink_msg_flight_information_send_buf(mavlink_message_t *ms
*/
static inline uint32_t mavlink_msg_flight_information_get_time_boot_ms(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint32_t(msg, 24);
return _MAV_RETURN_uint32_t(msg, 0);
}
/**
@@ -242,9 +242,9 @@ static inline uint32_t mavlink_msg_flight_information_get_time_boot_ms(const mav
*
* @return [us] Timestamp at arming (time since UNIX epoch) in UTC, 0 for unknown
*/
static inline uint64_t mavlink_msg_flight_information_get_arming_time_utc(const mavlink_message_t* msg)
static inline uint32_t mavlink_msg_flight_information_get_arming_time_utc(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint64_t(msg, 0);
return _MAV_RETURN_uint32_t(msg, 4);
}
/**
@@ -252,9 +252,9 @@ static inline uint64_t mavlink_msg_flight_information_get_arming_time_utc(const
*
* @return [us] Timestamp at takeoff (time since UNIX epoch) in UTC, 0 for unknown
*/
static inline uint64_t mavlink_msg_flight_information_get_takeoff_time_utc(const mavlink_message_t* msg)
static inline uint32_t mavlink_msg_flight_information_get_takeoff_time_utc(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint64_t(msg, 8);
return _MAV_RETURN_uint32_t(msg, 8);
}
/**
@@ -262,9 +262,9 @@ static inline uint64_t mavlink_msg_flight_information_get_takeoff_time_utc(const
*
* @return Universally unique identifier (UUID) of flight, should correspond to name of log files
*/
static inline uint64_t mavlink_msg_flight_information_get_flight_uuid(const mavlink_message_t* msg)
static inline uint32_t mavlink_msg_flight_information_get_flight_uuid(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint64_t(msg, 16);
return _MAV_RETURN_uint32_t(msg, 12);
}
/**
@@ -276,10 +276,10 @@ static inline uint64_t mavlink_msg_flight_information_get_flight_uuid(const mavl
static inline void mavlink_msg_flight_information_decode(const mavlink_message_t* msg, mavlink_flight_information_t* flight_information)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
flight_information->time_boot_ms = mavlink_msg_flight_information_get_time_boot_ms(msg);
flight_information->arming_time_utc = mavlink_msg_flight_information_get_arming_time_utc(msg);
flight_information->takeoff_time_utc = mavlink_msg_flight_information_get_takeoff_time_utc(msg);
flight_information->flight_uuid = mavlink_msg_flight_information_get_flight_uuid(msg);
flight_information->time_boot_ms = mavlink_msg_flight_information_get_time_boot_ms(msg);
#else
uint8_t len = msg->len < MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN? msg->len : MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN;
memset(flight_information, 0, MAVLINK_MSG_ID_FLIGHT_INFORMATION_LEN);