Skip to content

C
C-Astral dialect C library
Commit 189a1d89 authored by PX4BuildBot's avatar PX4BuildBot
Browse files
Options

autogenerated headers for rev... 

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/1a55f0bf6101d87ee50a92869c6a31a855526fd2
parent fe2349de
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 26 deletions
ASLUAV/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
ardupilotmega/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
autoquad/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
common/mavlink_msg_play_tune.h
View file @ 189a1d89
......@@ -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);
......
common/testsuite.h
View file @ 189a1d89
......@@ -8502,7 +8502,7 @@ static void mavlink_test_play_tune(uint8_t system_id, uint8_t component_id, mavl
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_play_tune_t packet_in = {
5,72,"CDEFGHIJKLMNOPQRSTUVWXYZABCDE"
5,72,"CDEFGHIJKLMNOPQRSTUVWXYZABCDE","GHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVW"
};
mavlink_play_tune_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
......@@ -8510,6 +8510,7 @@ static void mavlink_test_play_tune(uint8_t system_id, uint8_t component_id, mavl
packet1.target_component = packet_in.target_component;
mav_array_memcpy(packet1.tune, packet_in.tune, sizeof(char)*30);
mav_array_memcpy(packet1.tune2, packet_in.tune2, sizeof(char)*200);
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
if (status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) {
......@@ -8523,12 +8524,12 @@ static void mavlink_test_play_tune(uint8_t system_id, uint8_t component_id, mavl
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_play_tune_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.tune );
mavlink_msg_play_tune_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.tune , packet1.tune2 );
mavlink_msg_play_tune_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_play_tune_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.tune );
mavlink_msg_play_tune_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.tune , packet1.tune2 );
mavlink_msg_play_tune_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
......@@ -8541,7 +8542,7 @@ static void mavlink_test_play_tune(uint8_t system_id, uint8_t component_id, mavl
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_play_tune_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.tune );
mavlink_msg_play_tune_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.tune , packet1.tune2 );
mavlink_msg_play_tune_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
......
common/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
icarous/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
matrixpilot/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
message_definitions/common.xml
View file @ 189a1d89
......@@ -4515,6 +4515,8 @@
<field type="uint8_t" name="target_system">System ID</field>
<field type="uint8_t" name="target_component">Component ID</field>
<field type="char[30]" name="tune">tune in board specific format</field>
<extensions/>
<field type="char[200]" name="tune2">tune extension (appended to tune)</field>
</message>
<message id="259" name="CAMERA_INFORMATION">
<description>Information about a camera</description>
......
minimal/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
......
slugs/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
standard/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
test/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
......
uAvionix/version.h
View file @ 189a1d89
......@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Sat Aug 11 2018"
#define MAVLINK_BUILD_DATE "Mon Aug 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7