Commit 3fdedc4c authored by PX4BuildBot's avatar PX4BuildBot

autogenerated headers for rev...

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/9919ed2f5f428bd10a430ea71b83be878b02575c
parent 9bc6f7d5
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -9041,6 +9041,129 @@ static void mavlink_test_logging_ack(uint8_t system_id, uint8_t component_id, ma ...@@ -9041,6 +9041,129 @@ static void mavlink_test_logging_ack(uint8_t system_id, uint8_t component_id, ma
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
} }
static void mavlink_test_video_stream_information(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
mavlink_status_t *status = mavlink_get_channel_status(MAVLINK_COMM_0);
if ((status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) && MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION >= 256) {
return;
}
#endif
mavlink_message_t msg;
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_video_stream_information_t packet_in = {
17.0,963497672,17651,17755,17859,175,242,"QRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJK"
};
mavlink_video_stream_information_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.framerate = packet_in.framerate;
packet1.bitrate = packet_in.bitrate;
packet1.resolution_h = packet_in.resolution_h;
packet1.resolution_v = packet_in.resolution_v;
packet1.rotation = packet_in.rotation;
packet1.camera_id = packet_in.camera_id;
packet1.status = packet_in.status;
mav_array_memcpy(packet1.uri, packet_in.uri, sizeof(char)*230);
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
if (status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) {
// cope with extensions
memset(MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION_MIN_LEN + (char *)&packet1, 0, sizeof(packet1)-MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION_MIN_LEN);
}
#endif
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_video_stream_information_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_video_stream_information_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_video_stream_information_pack(system_id, component_id, &msg , packet1.camera_id , packet1.status , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_video_stream_information_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_video_stream_information_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.camera_id , packet1.status , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_video_stream_information_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_to_send_buffer(buffer, &msg);
for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
comm_send_ch(MAVLINK_COMM_0, buffer[i]);
}
mavlink_msg_video_stream_information_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_video_stream_information_send(MAVLINK_COMM_1 , packet1.camera_id , packet1.status , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_video_stream_information_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_set_video_stream_settings(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
mavlink_status_t *status = mavlink_get_channel_status(MAVLINK_COMM_0);
if ((status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) && MAVLINK_MSG_ID_SET_VIDEO_STREAM_SETTINGS >= 256) {
return;
}
#endif
mavlink_message_t msg;
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_set_video_stream_settings_t packet_in = {
17.0,963497672,17651,17755,17859,175,242,53,"RSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKL"
};
mavlink_set_video_stream_settings_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.framerate = packet_in.framerate;
packet1.bitrate = packet_in.bitrate;
packet1.resolution_h = packet_in.resolution_h;
packet1.resolution_v = packet_in.resolution_v;
packet1.rotation = packet_in.rotation;
packet1.target_system = packet_in.target_system;
packet1.target_component = packet_in.target_component;
packet1.camera_id = packet_in.camera_id;
mav_array_memcpy(packet1.uri, packet_in.uri, sizeof(char)*230);
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
if (status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) {
// cope with extensions
memset(MAVLINK_MSG_ID_SET_VIDEO_STREAM_SETTINGS_MIN_LEN + (char *)&packet1, 0, sizeof(packet1)-MAVLINK_MSG_ID_SET_VIDEO_STREAM_SETTINGS_MIN_LEN);
}
#endif
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_set_video_stream_settings_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_set_video_stream_settings_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_set_video_stream_settings_pack(system_id, component_id, &msg , packet1.target_system , packet1.target_component , packet1.camera_id , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_set_video_stream_settings_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_set_video_stream_settings_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.target_system , packet1.target_component , packet1.camera_id , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_set_video_stream_settings_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_to_send_buffer(buffer, &msg);
for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
comm_send_ch(MAVLINK_COMM_0, buffer[i]);
}
mavlink_msg_set_video_stream_settings_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_set_video_stream_settings_send(MAVLINK_COMM_1 , packet1.target_system , packet1.target_component , packet1.camera_id , packet1.framerate , packet1.resolution_h , packet1.resolution_v , packet1.bitrate , packet1.rotation , packet1.uri );
mavlink_msg_set_video_stream_settings_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg) static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{ {
mavlink_test_heartbeat(system_id, component_id, last_msg); mavlink_test_heartbeat(system_id, component_id, last_msg);
...@@ -9192,6 +9315,8 @@ static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink ...@@ -9192,6 +9315,8 @@ static void mavlink_test_common(uint8_t system_id, uint8_t component_id, mavlink
mavlink_test_logging_data(system_id, component_id, last_msg); mavlink_test_logging_data(system_id, component_id, last_msg);
mavlink_test_logging_data_acked(system_id, component_id, last_msg); mavlink_test_logging_data_acked(system_id, component_id, last_msg);
mavlink_test_logging_ack(system_id, component_id, last_msg); mavlink_test_logging_ack(system_id, component_id, last_msg);
mavlink_test_video_stream_information(system_id, component_id, last_msg);
mavlink_test_set_video_stream_settings(system_id, component_id, last_msg);
} }
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -1422,6 +1422,22 @@ ...@@ -1422,6 +1422,22 @@
<param index="1">Camera ID (0 for all cameras, 1 for first, 2 for second, etc.)</param> <param index="1">Camera ID (0 for all cameras, 1 for first, 2 for second, etc.)</param>
<param index="2">Reserved</param> <param index="2">Reserved</param>
</entry> </entry>
<entry value="2502" name="MAV_CMD_VIDEO_START_STREAMING">
<description>WIP: Start video streaming</description>
<param index="1">Camera ID (0 for all cameras, 1 for first, 2 for second, etc.)</param>
<param index="2">Reserved</param>
</entry>
<entry value="2503" name="MAV_CMD_VIDEO_STOP_STREAMING">
<description>WIP: Stop the current video streaming</description>
<param index="1">Camera ID (0 for all cameras, 1 for first, 2 for second, etc.)</param>
<param index="2">Reserved</param>
</entry>
<entry value="2504" name="MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION">
<description>WIP: Request video stream information (VIDEO_STREAM_INFORMATION)</description>
<param index="1">Camera ID (0 for all cameras, 1 for first, 2 for second, etc.)</param>
<param index="2">0: No Action 1: Request video stream information</param>
<param index="3">Reserved (all remaining params)</param>
</entry>
<entry value="2510" name="MAV_CMD_LOGGING_START"> <entry value="2510" name="MAV_CMD_LOGGING_START">
<description>Request to start streaming logging data over MAVLink (see also LOGGING_DATA message)</description> <description>Request to start streaming logging data over MAVLink (see also LOGGING_DATA message)</description>
<param index="1">Format: 0: ULog</param> <param index="1">Format: 0: ULog</param>
...@@ -4030,5 +4046,28 @@ ...@@ -4030,5 +4046,28 @@
<field type="uint8_t" name="target_component">component ID of the target</field> <field type="uint8_t" name="target_component">component ID of the target</field>
<field type="uint16_t" name="sequence">sequence number (must match the one in LOGGING_DATA_ACKED)</field> <field type="uint16_t" name="sequence">sequence number (must match the one in LOGGING_DATA_ACKED)</field>
</message> </message>
<message id="269" name="VIDEO_STREAM_INFORMATION">
<description>WIP: Information about video stream</description>
<field type="uint8_t" name="camera_id">Camera ID (1 for first, 2 for second, etc.)</field>
<field type="uint8_t" name="status">Current status of video streaming (0: not running, 1: in progress)</field>
<field type="float" name="framerate" units="Hz">Frames per second</field>
<field type="uint16_t" name="resolution_h" units="pix">Resolution horizontal in pixels</field>
<field type="uint16_t" name="resolution_v" units="pix">Resolution vertical in pixels</field>
<field type="uint32_t" name="bitrate" units="b/s">Bit rate in bits per second</field>
<field type="uint16_t" name="rotation" units="deg">Video image rotation clockwise</field>
<field type="char[230]" name="uri">Video stream URI</field>
</message>
<message id="270" name="SET_VIDEO_STREAM_SETTINGS">
<description>WIP: Message that sets video stream settings</description>
<field type="uint8_t" name="target_system">system ID of the target</field>
<field type="uint8_t" name="target_component">component ID of the target</field>
<field type="uint8_t" name="camera_id">Camera ID (1 for first, 2 for second, etc.)</field>
<field type="float" name="framerate" units="Hz">Frames per second (set to -1 for highest framerate possible)</field>
<field type="uint16_t" name="resolution_h" units="pix">Resolution horizontal in pixels (set to -1 for highest resolution possible)</field>
<field type="uint16_t" name="resolution_v" units="pix">Resolution vertical in pixels (set to -1 for highest resolution possible)</field>
<field type="uint32_t" name="bitrate" units="b/s">Bit rate in bits per second (set to -1 for auto)</field>
<field type="uint16_t" name="rotation" units="deg">Video image rotation clockwise (0-359 degrees)</field>
<field type="char[230]" name="uri">Video stream URI</field>
</message>
</messages> </messages>
</mavlink> </mavlink>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed May 03 2017" #define MAVLINK_BUILD_DATE "Thu May 04 2017"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #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