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

✨feat: 更好兼容matlab

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
common/mavlink_msg_collision.h
+6 -6
View File
@@ -3,7 +3,7 @@
#define MAVLINK_MSG_ID_COLLISION 247
MAVPACKED(
typedef struct __mavlink_collision_t {
uint32_t id; /*< Unique identifier, domain based on src field*/
float time_to_minimum_delta; /*< [s] Estimated time until collision occurs*/
@@ -12,7 +12,7 @@ typedef struct __mavlink_collision_t {
uint8_t src; /*< Collision data source*/
uint8_t action; /*< Action that is being taken to avoid this collision*/
uint8_t threat_level; /*< How concerned the aircraft is about this collision*/
}) mavlink_collision_t;
} mavlink_collision_t;
#define MAVLINK_MSG_ID_COLLISION_LEN 19
#define MAVLINK_MSG_ID_COLLISION_MIN_LEN 19
@@ -68,7 +68,7 @@ typedef struct __mavlink_collision_t {
* @param horizontal_minimum_delta [m] Closest horizontal distance between vehicle and object
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_collision_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
static inline uint16_t mavlink_msg_collision_pack(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint8_t src, uint32_t id, uint8_t action, uint8_t threat_level, float time_to_minimum_delta, float altitude_minimum_delta, float horizontal_minimum_delta)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
@@ -114,7 +114,7 @@ static inline uint16_t mavlink_msg_collision_pack(uint8_t system_id, uint8_t com
* @param horizontal_minimum_delta [m] Closest horizontal distance between vehicle and object
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_collision_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
static inline uint16_t mavlink_msg_collision_pack_chan(uint16_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
uint8_t src,uint32_t id,uint8_t action,uint8_t threat_level,float time_to_minimum_delta,float altitude_minimum_delta,float horizontal_minimum_delta)
{
@@ -154,7 +154,7 @@ static inline uint16_t mavlink_msg_collision_pack_chan(uint8_t system_id, uint8_
* @param msg The MAVLink message to compress the data into
* @param collision C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_collision_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_collision_t* collision)
static inline uint16_t mavlink_msg_collision_encode(uint16_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_collision_t* collision)
{
return mavlink_msg_collision_pack(system_id, component_id, msg, collision->src, collision->id, collision->action, collision->threat_level, collision->time_to_minimum_delta, collision->altitude_minimum_delta, collision->horizontal_minimum_delta);
}
@@ -168,7 +168,7 @@ static inline uint16_t mavlink_msg_collision_encode(uint8_t system_id, uint8_t c
* @param msg The MAVLink message to compress the data into
* @param collision C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_collision_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_collision_t* collision)
static inline uint16_t mavlink_msg_collision_encode_chan(uint16_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_collision_t* collision)
{
return mavlink_msg_collision_pack_chan(system_id, component_id, chan, msg, collision->src, collision->id, collision->action, collision->threat_level, collision->time_to_minimum_delta, collision->altitude_minimum_delta, collision->horizontal_minimum_delta);
}