✨feat: 更好兼容matlab
uin64->uint32 payload64->payload
This commit is contained in:
@@ -3,22 +3,22 @@
|
||||
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE 28
|
||||
|
||||
MAVPACKED(
|
||||
|
||||
typedef struct __mavlink_raw_pressure_t {
|
||||
uint64_t time_usec; /*< [us] Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number.*/
|
||||
uint32_t time_usec; /*< [us] Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number.*/
|
||||
int16_t press_abs; /*< Absolute pressure (raw)*/
|
||||
int16_t press_diff1; /*< Differential pressure 1 (raw, 0 if nonexistent)*/
|
||||
int16_t press_diff2; /*< Differential pressure 2 (raw, 0 if nonexistent)*/
|
||||
int16_t temperature; /*< Raw Temperature measurement (raw)*/
|
||||
}) mavlink_raw_pressure_t;
|
||||
} mavlink_raw_pressure_t;
|
||||
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_LEN 16
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_MIN_LEN 16
|
||||
#define MAVLINK_MSG_ID_28_LEN 16
|
||||
#define MAVLINK_MSG_ID_28_MIN_LEN 16
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_LEN 12
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_MIN_LEN 12
|
||||
#define MAVLINK_MSG_ID_28_LEN 12
|
||||
#define MAVLINK_MSG_ID_28_MIN_LEN 12
|
||||
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_CRC 67
|
||||
#define MAVLINK_MSG_ID_28_CRC 67
|
||||
#define MAVLINK_MSG_ID_RAW_PRESSURE_CRC 162
|
||||
#define MAVLINK_MSG_ID_28_CRC 162
|
||||
|
||||
|
||||
|
||||
@@ -27,22 +27,22 @@ typedef struct __mavlink_raw_pressure_t {
|
||||
28, \
|
||||
"RAW_PRESSURE", \
|
||||
5, \
|
||||
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_raw_pressure_t, time_usec) }, \
|
||||
{ "press_abs", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_pressure_t, press_abs) }, \
|
||||
{ "press_diff1", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_pressure_t, press_diff1) }, \
|
||||
{ "press_diff2", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_raw_pressure_t, press_diff2) }, \
|
||||
{ "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_raw_pressure_t, temperature) }, \
|
||||
{ { "time_usec", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_raw_pressure_t, time_usec) }, \
|
||||
{ "press_abs", NULL, MAVLINK_TYPE_INT16_T, 0, 4, offsetof(mavlink_raw_pressure_t, press_abs) }, \
|
||||
{ "press_diff1", NULL, MAVLINK_TYPE_INT16_T, 0, 6, offsetof(mavlink_raw_pressure_t, press_diff1) }, \
|
||||
{ "press_diff2", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_pressure_t, press_diff2) }, \
|
||||
{ "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_pressure_t, temperature) }, \
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define MAVLINK_MESSAGE_INFO_RAW_PRESSURE { \
|
||||
"RAW_PRESSURE", \
|
||||
5, \
|
||||
{ { "time_usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_raw_pressure_t, time_usec) }, \
|
||||
{ "press_abs", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_pressure_t, press_abs) }, \
|
||||
{ "press_diff1", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_pressure_t, press_diff1) }, \
|
||||
{ "press_diff2", NULL, MAVLINK_TYPE_INT16_T, 0, 12, offsetof(mavlink_raw_pressure_t, press_diff2) }, \
|
||||
{ "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_raw_pressure_t, temperature) }, \
|
||||
{ { "time_usec", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_raw_pressure_t, time_usec) }, \
|
||||
{ "press_abs", NULL, MAVLINK_TYPE_INT16_T, 0, 4, offsetof(mavlink_raw_pressure_t, press_abs) }, \
|
||||
{ "press_diff1", NULL, MAVLINK_TYPE_INT16_T, 0, 6, offsetof(mavlink_raw_pressure_t, press_diff1) }, \
|
||||
{ "press_diff2", NULL, MAVLINK_TYPE_INT16_T, 0, 8, offsetof(mavlink_raw_pressure_t, press_diff2) }, \
|
||||
{ "temperature", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_pressure_t, temperature) }, \
|
||||
} \
|
||||
}
|
||||
#endif
|
||||
@@ -60,16 +60,16 @@ typedef struct __mavlink_raw_pressure_t {
|
||||
* @param temperature Raw Temperature measurement (raw)
|
||||
* @return length of the message in bytes (excluding serial stream start sign)
|
||||
*/
|
||||
static inline uint16_t mavlink_msg_raw_pressure_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
|
||||
uint64_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
static inline uint16_t mavlink_msg_raw_pressure_pack(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg,
|
||||
uint32_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
{
|
||||
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
|
||||
char buf[MAVLINK_MSG_ID_RAW_PRESSURE_LEN];
|
||||
_mav_put_uint64_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 8, press_abs);
|
||||
_mav_put_int16_t(buf, 10, press_diff1);
|
||||
_mav_put_int16_t(buf, 12, press_diff2);
|
||||
_mav_put_int16_t(buf, 14, temperature);
|
||||
_mav_put_uint32_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 4, press_abs);
|
||||
_mav_put_int16_t(buf, 6, press_diff1);
|
||||
_mav_put_int16_t(buf, 8, press_diff2);
|
||||
_mav_put_int16_t(buf, 10, temperature);
|
||||
|
||||
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_RAW_PRESSURE_LEN);
|
||||
#else
|
||||
@@ -100,17 +100,17 @@ static inline uint16_t mavlink_msg_raw_pressure_pack(uint8_t system_id, uint8_t
|
||||
* @param temperature Raw Temperature measurement (raw)
|
||||
* @return length of the message in bytes (excluding serial stream start sign)
|
||||
*/
|
||||
static inline uint16_t mavlink_msg_raw_pressure_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
|
||||
static inline uint16_t mavlink_msg_raw_pressure_pack_chan(uint16_t system_id, uint8_t component_id, uint8_t chan,
|
||||
mavlink_message_t* msg,
|
||||
uint64_t time_usec,int16_t press_abs,int16_t press_diff1,int16_t press_diff2,int16_t temperature)
|
||||
uint32_t time_usec,int16_t press_abs,int16_t press_diff1,int16_t press_diff2,int16_t temperature)
|
||||
{
|
||||
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
|
||||
char buf[MAVLINK_MSG_ID_RAW_PRESSURE_LEN];
|
||||
_mav_put_uint64_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 8, press_abs);
|
||||
_mav_put_int16_t(buf, 10, press_diff1);
|
||||
_mav_put_int16_t(buf, 12, press_diff2);
|
||||
_mav_put_int16_t(buf, 14, temperature);
|
||||
_mav_put_uint32_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 4, press_abs);
|
||||
_mav_put_int16_t(buf, 6, press_diff1);
|
||||
_mav_put_int16_t(buf, 8, press_diff2);
|
||||
_mav_put_int16_t(buf, 10, temperature);
|
||||
|
||||
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_RAW_PRESSURE_LEN);
|
||||
#else
|
||||
@@ -136,7 +136,7 @@ static inline uint16_t mavlink_msg_raw_pressure_pack_chan(uint8_t system_id, uin
|
||||
* @param msg The MAVLink message to compress the data into
|
||||
* @param raw_pressure C-struct to read the message contents from
|
||||
*/
|
||||
static inline uint16_t mavlink_msg_raw_pressure_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_raw_pressure_t* raw_pressure)
|
||||
static inline uint16_t mavlink_msg_raw_pressure_encode(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_raw_pressure_t* raw_pressure)
|
||||
{
|
||||
return mavlink_msg_raw_pressure_pack(system_id, component_id, msg, raw_pressure->time_usec, raw_pressure->press_abs, raw_pressure->press_diff1, raw_pressure->press_diff2, raw_pressure->temperature);
|
||||
}
|
||||
@@ -150,7 +150,7 @@ static inline uint16_t mavlink_msg_raw_pressure_encode(uint8_t system_id, uint8_
|
||||
* @param msg The MAVLink message to compress the data into
|
||||
* @param raw_pressure C-struct to read the message contents from
|
||||
*/
|
||||
static inline uint16_t mavlink_msg_raw_pressure_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_raw_pressure_t* raw_pressure)
|
||||
static inline uint16_t mavlink_msg_raw_pressure_encode_chan(uint16_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_raw_pressure_t* raw_pressure)
|
||||
{
|
||||
return mavlink_msg_raw_pressure_pack_chan(system_id, component_id, chan, msg, raw_pressure->time_usec, raw_pressure->press_abs, raw_pressure->press_diff1, raw_pressure->press_diff2, raw_pressure->temperature);
|
||||
}
|
||||
@@ -167,15 +167,15 @@ static inline uint16_t mavlink_msg_raw_pressure_encode_chan(uint8_t system_id, u
|
||||
*/
|
||||
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
|
||||
|
||||
static inline void mavlink_msg_raw_pressure_send(mavlink_channel_t chan, uint64_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
static inline void mavlink_msg_raw_pressure_send(mavlink_channel_t chan, uint32_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
{
|
||||
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
|
||||
char buf[MAVLINK_MSG_ID_RAW_PRESSURE_LEN];
|
||||
_mav_put_uint64_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 8, press_abs);
|
||||
_mav_put_int16_t(buf, 10, press_diff1);
|
||||
_mav_put_int16_t(buf, 12, press_diff2);
|
||||
_mav_put_int16_t(buf, 14, temperature);
|
||||
_mav_put_uint32_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 4, press_abs);
|
||||
_mav_put_int16_t(buf, 6, press_diff1);
|
||||
_mav_put_int16_t(buf, 8, press_diff2);
|
||||
_mav_put_int16_t(buf, 10, temperature);
|
||||
|
||||
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_PRESSURE, buf, MAVLINK_MSG_ID_RAW_PRESSURE_MIN_LEN, MAVLINK_MSG_ID_RAW_PRESSURE_LEN, MAVLINK_MSG_ID_RAW_PRESSURE_CRC);
|
||||
#else
|
||||
@@ -212,15 +212,15 @@ static inline void mavlink_msg_raw_pressure_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_raw_pressure_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
static inline void mavlink_msg_raw_pressure_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint32_t time_usec, int16_t press_abs, int16_t press_diff1, int16_t press_diff2, int16_t temperature)
|
||||
{
|
||||
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
|
||||
char *buf = (char *)msgbuf;
|
||||
_mav_put_uint64_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 8, press_abs);
|
||||
_mav_put_int16_t(buf, 10, press_diff1);
|
||||
_mav_put_int16_t(buf, 12, press_diff2);
|
||||
_mav_put_int16_t(buf, 14, temperature);
|
||||
_mav_put_uint32_t(buf, 0, time_usec);
|
||||
_mav_put_int16_t(buf, 4, press_abs);
|
||||
_mav_put_int16_t(buf, 6, press_diff1);
|
||||
_mav_put_int16_t(buf, 8, press_diff2);
|
||||
_mav_put_int16_t(buf, 10, temperature);
|
||||
|
||||
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_PRESSURE, buf, MAVLINK_MSG_ID_RAW_PRESSURE_MIN_LEN, MAVLINK_MSG_ID_RAW_PRESSURE_LEN, MAVLINK_MSG_ID_RAW_PRESSURE_CRC);
|
||||
#else
|
||||
@@ -246,9 +246,9 @@ static inline void mavlink_msg_raw_pressure_send_buf(mavlink_message_t *msgbuf,
|
||||
*
|
||||
* @return [us] Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number.
|
||||
*/
|
||||
static inline uint64_t mavlink_msg_raw_pressure_get_time_usec(const mavlink_message_t* msg)
|
||||
static inline uint32_t mavlink_msg_raw_pressure_get_time_usec(const mavlink_message_t* msg)
|
||||
{
|
||||
return _MAV_RETURN_uint64_t(msg, 0);
|
||||
return _MAV_RETURN_uint32_t(msg, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -258,7 +258,7 @@ static inline uint64_t mavlink_msg_raw_pressure_get_time_usec(const mavlink_mess
|
||||
*/
|
||||
static inline int16_t mavlink_msg_raw_pressure_get_press_abs(const mavlink_message_t* msg)
|
||||
{
|
||||
return _MAV_RETURN_int16_t(msg, 8);
|
||||
return _MAV_RETURN_int16_t(msg, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -268,7 +268,7 @@ static inline int16_t mavlink_msg_raw_pressure_get_press_abs(const mavlink_messa
|
||||
*/
|
||||
static inline int16_t mavlink_msg_raw_pressure_get_press_diff1(const mavlink_message_t* msg)
|
||||
{
|
||||
return _MAV_RETURN_int16_t(msg, 10);
|
||||
return _MAV_RETURN_int16_t(msg, 6);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -278,7 +278,7 @@ static inline int16_t mavlink_msg_raw_pressure_get_press_diff1(const mavlink_mes
|
||||
*/
|
||||
static inline int16_t mavlink_msg_raw_pressure_get_press_diff2(const mavlink_message_t* msg)
|
||||
{
|
||||
return _MAV_RETURN_int16_t(msg, 12);
|
||||
return _MAV_RETURN_int16_t(msg, 8);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -288,7 +288,7 @@ static inline int16_t mavlink_msg_raw_pressure_get_press_diff2(const mavlink_mes
|
||||
*/
|
||||
static inline int16_t mavlink_msg_raw_pressure_get_temperature(const mavlink_message_t* msg)
|
||||
{
|
||||
return _MAV_RETURN_int16_t(msg, 14);
|
||||
return _MAV_RETURN_int16_t(msg, 10);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user