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

update and merge

Browse Source
This commit is contained in:
Matt
2018-12-06 01:31:47 +08:00
parent 33d09d8d50
commit 7695f414f9
45 changed files with 2565 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/mavlink_msg_play_tune.h
+37 -11
View File
@@ -8,35 +8,39 @@ typedef struct __mavlink_play_tune_t {
uint8_t target_system; /*< System ID*/
uint8_t target_component; /*< Component ID*/
char tune[30]; /*< tune in board specific format*/
char tune2[200]; /*< tune extension (appended to tune)*/
}) mavlink_play_tune_t;
#define MAVLINK_MSG_ID_PLAY_TUNE_LEN 32
#define MAVLINK_MSG_ID_PLAY_TUNE_LEN 232
#define MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN 32
#define MAVLINK_MSG_ID_258_LEN 32
#define MAVLINK_MSG_ID_258_LEN 232
#define MAVLINK_MSG_ID_258_MIN_LEN 32
#define MAVLINK_MSG_ID_PLAY_TUNE_CRC 187
#define MAVLINK_MSG_ID_258_CRC 187
#define MAVLINK_MSG_PLAY_TUNE_FIELD_TUNE_LEN 30
#define MAVLINK_MSG_PLAY_TUNE_FIELD_TUNE2_LEN 200
#if MAVLINK_COMMAND_24BIT
#define MAVLINK_MESSAGE_INFO_PLAY_TUNE { \
258, \
"PLAY_TUNE", \
3, \
4, \
{ { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_play_tune_t, target_system) }, \
{ "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_play_tune_t, target_component) }, \
{ "tune", NULL, MAVLINK_TYPE_CHAR, 30, 2, offsetof(mavlink_play_tune_t, tune) }, \
{ "tune2", NULL, MAVLINK_TYPE_CHAR, 200, 32, offsetof(mavlink_play_tune_t, tune2) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_PLAY_TUNE { \
"PLAY_TUNE", \
3, \
4, \
{ { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_play_tune_t, target_system) }, \
{ "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_play_tune_t, target_component) }, \
{ "tune", NULL, MAVLINK_TYPE_CHAR, 30, 2, offsetof(mavlink_play_tune_t, tune) }, \
{ "tune2", NULL, MAVLINK_TYPE_CHAR, 200, 32, offsetof(mavlink_play_tune_t, tune2) }, \
} \
}
#endif
@@ -50,22 +54,25 @@ typedef struct __mavlink_play_tune_t {
* @param target_system System ID
* @param target_component Component ID
* @param tune tune in board specific format
* @param tune2 tune extension (appended to tune)
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_play_tune_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
uint8_t target_system, uint8_t target_component, const char *tune)
uint8_t target_system, uint8_t target_component, const char *tune, const char *tune2)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_PLAY_TUNE_LEN];
_mav_put_uint8_t(buf, 0, target_system);
_mav_put_uint8_t(buf, 1, target_component);
_mav_put_char_array(buf, 2, tune, 30);
_mav_put_char_array(buf, 32, tune2, 200);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PLAY_TUNE_LEN);
#else
mavlink_play_tune_t packet;
packet.target_system = target_system;
packet.target_component = target_component;
mav_array_memcpy(packet.tune, tune, sizeof(char)*30);
mav_array_memcpy(packet.tune2, tune2, sizeof(char)*200);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_PLAY_TUNE_LEN);
#endif
@@ -82,23 +89,26 @@ static inline uint16_t mavlink_msg_play_tune_pack(uint8_t system_id, uint8_t com
* @param target_system System ID
* @param target_component Component ID
* @param tune tune in board specific format
* @param tune2 tune extension (appended to tune)
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_play_tune_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
uint8_t target_system,uint8_t target_component,const char *tune)
uint8_t target_system,uint8_t target_component,const char *tune,const char *tune2)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_PLAY_TUNE_LEN];
_mav_put_uint8_t(buf, 0, target_system);
_mav_put_uint8_t(buf, 1, target_component);
_mav_put_char_array(buf, 2, tune, 30);
_mav_put_char_array(buf, 32, tune2, 200);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PLAY_TUNE_LEN);
#else
mavlink_play_tune_t packet;
packet.target_system = target_system;
packet.target_component = target_component;
mav_array_memcpy(packet.tune, tune, sizeof(char)*30);
mav_array_memcpy(packet.tune2, tune2, sizeof(char)*200);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_PLAY_TUNE_LEN);
#endif
@@ -116,7 +126,7 @@ static inline uint16_t mavlink_msg_play_tune_pack_chan(uint8_t system_id, uint8_
*/
static inline uint16_t mavlink_msg_play_tune_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_play_tune_t* play_tune)
{
return mavlink_msg_play_tune_pack(system_id, component_id, msg, play_tune->target_system, play_tune->target_component, play_tune->tune);
return mavlink_msg_play_tune_pack(system_id, component_id, msg, play_tune->target_system, play_tune->target_component, play_tune->tune, play_tune->tune2);
}
/**
@@ -130,7 +140,7 @@ static inline uint16_t mavlink_msg_play_tune_encode(uint8_t system_id, uint8_t c
*/
static inline uint16_t mavlink_msg_play_tune_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_play_tune_t* play_tune)
{
return mavlink_msg_play_tune_pack_chan(system_id, component_id, chan, msg, play_tune->target_system, play_tune->target_component, play_tune->tune);
return mavlink_msg_play_tune_pack_chan(system_id, component_id, chan, msg, play_tune->target_system, play_tune->target_component, play_tune->tune, play_tune->tune2);
}
/**
@@ -140,22 +150,25 @@ static inline uint16_t mavlink_msg_play_tune_encode_chan(uint8_t system_id, uint
* @param target_system System ID
* @param target_component Component ID
* @param tune tune in board specific format
* @param tune2 tune extension (appended to tune)
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_play_tune_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const char *tune)
static inline void mavlink_msg_play_tune_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const char *tune, const char *tune2)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_PLAY_TUNE_LEN];
_mav_put_uint8_t(buf, 0, target_system);
_mav_put_uint8_t(buf, 1, target_component);
_mav_put_char_array(buf, 2, tune, 30);
_mav_put_char_array(buf, 32, tune2, 200);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PLAY_TUNE, buf, MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN, MAVLINK_MSG_ID_PLAY_TUNE_LEN, MAVLINK_MSG_ID_PLAY_TUNE_CRC);
#else
mavlink_play_tune_t packet;
packet.target_system = target_system;
packet.target_component = target_component;
mav_array_memcpy(packet.tune, tune, sizeof(char)*30);
mav_array_memcpy(packet.tune2, tune2, sizeof(char)*200);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PLAY_TUNE, (const char *)&packet, MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN, MAVLINK_MSG_ID_PLAY_TUNE_LEN, MAVLINK_MSG_ID_PLAY_TUNE_CRC);
#endif
}
@@ -168,7 +181,7 @@ static inline void mavlink_msg_play_tune_send(mavlink_channel_t chan, uint8_t ta
static inline void mavlink_msg_play_tune_send_struct(mavlink_channel_t chan, const mavlink_play_tune_t* play_tune)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
mavlink_msg_play_tune_send(chan, play_tune->target_system, play_tune->target_component, play_tune->tune);
mavlink_msg_play_tune_send(chan, play_tune->target_system, play_tune->target_component, play_tune->tune, play_tune->tune2);
#else
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PLAY_TUNE, (const char *)play_tune, MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN, MAVLINK_MSG_ID_PLAY_TUNE_LEN, MAVLINK_MSG_ID_PLAY_TUNE_CRC);
#endif
@@ -182,19 +195,21 @@ static inline void mavlink_msg_play_tune_send_struct(mavlink_channel_t chan, con
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_play_tune_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const char *tune)
static inline void mavlink_msg_play_tune_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, const char *tune, const char *tune2)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
_mav_put_uint8_t(buf, 0, target_system);
_mav_put_uint8_t(buf, 1, target_component);
_mav_put_char_array(buf, 2, tune, 30);
_mav_put_char_array(buf, 32, tune2, 200);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PLAY_TUNE, buf, MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN, MAVLINK_MSG_ID_PLAY_TUNE_LEN, MAVLINK_MSG_ID_PLAY_TUNE_CRC);
#else
mavlink_play_tune_t *packet = (mavlink_play_tune_t *)msgbuf;
packet->target_system = target_system;
packet->target_component = target_component;
mav_array_memcpy(packet->tune, tune, sizeof(char)*30);
mav_array_memcpy(packet->tune2, tune2, sizeof(char)*200);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PLAY_TUNE, (const char *)packet, MAVLINK_MSG_ID_PLAY_TUNE_MIN_LEN, MAVLINK_MSG_ID_PLAY_TUNE_LEN, MAVLINK_MSG_ID_PLAY_TUNE_CRC);
#endif
}
@@ -235,6 +250,16 @@ static inline uint16_t mavlink_msg_play_tune_get_tune(const mavlink_message_t* m
return _MAV_RETURN_char_array(msg, tune, 30, 2);
}
/**
* @brief Get field tune2 from play_tune message
*
* @return tune extension (appended to tune)
*/
static inline uint16_t mavlink_msg_play_tune_get_tune2(const mavlink_message_t* msg, char *tune2)
{
return _MAV_RETURN_char_array(msg, tune2, 200, 32);
}
/**
* @brief Decode a play_tune message into a struct
*
@@ -247,6 +272,7 @@ static inline void mavlink_msg_play_tune_decode(const mavlink_message_t* msg, ma
play_tune->target_system = mavlink_msg_play_tune_get_target_system(msg);
play_tune->target_component = mavlink_msg_play_tune_get_target_component(msg);
mavlink_msg_play_tune_get_tune(msg, play_tune->tune);
mavlink_msg_play_tune_get_tune2(msg, play_tune->tune2);
#else
uint8_t len = msg->len < MAVLINK_MSG_ID_PLAY_TUNE_LEN? msg->len : MAVLINK_MSG_ID_PLAY_TUNE_LEN;
memset(play_tune, 0, MAVLINK_MSG_ID_PLAY_TUNE_LEN);