Commit 469aa80b authored by PX4BuildBot's avatar PX4BuildBot

autogenerated headers for rev...

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/a34fac16c6777f9040068289a1b7490c4d56cc8d
parent edbe9bd9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -34,6 +34,16 @@ extern "C" { ...@@ -34,6 +34,16 @@ extern "C" {
// ENUM DEFINITIONS // ENUM DEFINITIONS
/** @brief Track current version of these definitions (can be used by checking value of AUTOQUAD_MAVLINK_DEFS_VERSION_ENUM_END). Append a new entry for each published change. */
#ifndef HAVE_ENUM_AUTOQUAD_MAVLINK_DEFS_VERSION
#define HAVE_ENUM_AUTOQUAD_MAVLINK_DEFS_VERSION
typedef enum AUTOQUAD_MAVLINK_DEFS_VERSION
{
AQ_MAVLINK_DEFS_VERSION_1=1, /* | */
AUTOQUAD_MAVLINK_DEFS_VERSION_ENUM_END=2, /* | */
} AUTOQUAD_MAVLINK_DEFS_VERSION;
#endif
/** @brief Available operating modes/statuses for AutoQuad flight controller. /** @brief Available operating modes/statuses for AutoQuad flight controller.
Bitmask up to 32 bits. Low side bits for base modes, high side for Bitmask up to 32 bits. Low side bits for base modes, high side for
additional active features/modifiers/constraints. */ additional active features/modifiers/constraints. */
...@@ -42,12 +52,19 @@ extern "C" { ...@@ -42,12 +52,19 @@ extern "C" {
typedef enum AUTOQUAD_NAV_STATUS typedef enum AUTOQUAD_NAV_STATUS
{ {
AQ_NAV_STATUS_INIT=0, /* System is initializing | */ AQ_NAV_STATUS_INIT=0, /* System is initializing | */
AQ_NAV_STATUS_STANDBY=1, /* System is standing by, not active | */ AQ_NAV_STATUS_STANDBY=1, /* System is *armed* and standing by, with no throttle input and no autonomous mode | */
AQ_NAV_STATUS_MANUAL=2, /* Stabilized, under full manual control | */ AQ_NAV_STATUS_MANUAL=2, /* Flying (throttle input detected), assumed under manual control unless other mode bits are set | */
AQ_NAV_STATUS_ALTHOLD=4, /* Altitude hold engaged | */ AQ_NAV_STATUS_ALTHOLD=4, /* Altitude hold engaged | */
AQ_NAV_STATUS_POSHOLD=8, /* Position hold engaged | */ AQ_NAV_STATUS_POSHOLD=8, /* Position hold engaged | */
AQ_NAV_STATUS_DVH=16, /* Dynamic Velocity Hold is active | */ AQ_NAV_STATUS_GUIDED=16, /* Externally-guided (eg. GCS) navigation mode | */
AQ_NAV_STATUS_MISSION=32, /* Autonomous mission execution mode | */ AQ_NAV_STATUS_MISSION=32, /* Autonomous mission execution mode | */
AQ_NAV_STATUS_READY=256, /* Ready but *not armed* | */
AQ_NAV_STATUS_CALIBRATING=512, /* Calibration mode active | */
AQ_NAV_STATUS_NO_RC=4096, /* No valid control input (eg. no radio link) | */
AQ_NAV_STATUS_FUEL_LOW=8192, /* Battery is low (stage 1 warning) | */
AQ_NAV_STATUS_FUEL_CRITICAL=16384, /* Battery is depleted (stage 2 warning) | */
AQ_NAV_STATUS_DVH=16777216, /* Dynamic Velocity Hold is active (PH with proportional manual direction override) | */
AQ_NAV_STATUS_DAO=33554432, /* ynamic Altitude Override is active (AH with proportional manual adjustment) | */
AQ_NAV_STATUS_CEILING_REACHED=67108864, /* Craft is at ceiling altitude | */ AQ_NAV_STATUS_CEILING_REACHED=67108864, /* Craft is at ceiling altitude | */
AQ_NAV_STATUS_CEILING=134217728, /* Ceiling altitude is set | */ AQ_NAV_STATUS_CEILING=134217728, /* Ceiling altitude is set | */
AQ_NAV_STATUS_HF_DYNAMIC=268435456, /* Heading-Free dynamic mode active | */ AQ_NAV_STATUS_HF_DYNAMIC=268435456, /* Heading-Free dynamic mode active | */
...@@ -63,8 +80,8 @@ typedef enum AUTOQUAD_NAV_STATUS ...@@ -63,8 +80,8 @@ typedef enum AUTOQUAD_NAV_STATUS
#define HAVE_ENUM_MAV_CMD #define HAVE_ENUM_MAV_CMD
typedef enum MAV_CMD typedef enum MAV_CMD
{ {
MAV_CMD_AQ_NAV_LEG_ORBIT=1, /* Orbit a waypoint. |Orbit radius in meters| Loiter time in decimal seconds| Maximum horizontal speed in m/s| Desired yaw angle at waypoint| Latitude| Longitude| Altitude| */
MAV_CMD_AQ_TELEMETRY=2, /* Start/stop AutoQuad telemetry values stream. |Start or stop (1 or 0)| Stream frequency in us| Dataset ID (refer to aq_mavlink.h::mavlinkCustomDataSets enum in AQ flight controller code)| Empty| Empty| Empty| Empty| */ MAV_CMD_AQ_TELEMETRY=2, /* Start/stop AutoQuad telemetry values stream. |Start or stop (1 or 0)| Stream frequency in us| Dataset ID (refer to aq_mavlink.h::mavlinkCustomDataSets enum in AQ flight controller code)| Empty| Empty| Empty| Empty| */
MAV_CMD_AQ_FOLLOW=3, /* Command AutoQuad to go to a particular place at a set speed. |Latitude| Lontitude| Altitude| Speed| Empty| Empty| Empty| */
MAV_CMD_AQ_REQUEST_VERSION=4, /* Request AutoQuad firmware version number. |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ MAV_CMD_AQ_REQUEST_VERSION=4, /* Request AutoQuad firmware version number. |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_NAV_WAYPOINT=16, /* Navigate to MISSION. |Hold time in decimal seconds. (ignored by fixed wing, time to stay at MISSION for rotary wing)| Acceptance radius in meters (if the sphere with this radius is hit, the MISSION counts as reached)| 0 to pass through the WP, if > 0 radius in meters to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at MISSION (rotary wing)| Latitude| Longitude| Altitude| */ MAV_CMD_NAV_WAYPOINT=16, /* Navigate to MISSION. |Hold time in decimal seconds. (ignored by fixed wing, time to stay at MISSION for rotary wing)| Acceptance radius in meters (if the sphere with this radius is hit, the MISSION counts as reached)| 0 to pass through the WP, if > 0 radius in meters to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at MISSION (rotary wing)| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_LOITER_UNLIM=17, /* Loiter around this MISSION an unlimited amount of time |Empty| Empty| Radius around MISSION, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */ MAV_CMD_NAV_LOITER_UNLIM=17, /* Loiter around this MISSION an unlimited amount of time |Empty| Empty| Radius around MISSION, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<include>common.xml</include> <include>common.xml</include>
<version>3</version> <version>3</version>
<enums> <enums>
<enum name="AUTOQUAD_MAVLINK_DEFS_VERSION">
<description>Track current version of these definitions (can be used by checking value of AUTOQUAD_MAVLINK_DEFS_VERSION_ENUM_END). Append a new entry for each published change.</description>
<entry name="AQ_MAVLINK_DEFS_VERSION_1" />
</enum>
<enum name="AUTOQUAD_NAV_STATUS"> <enum name="AUTOQUAD_NAV_STATUS">
<description>Available operating modes/statuses for AutoQuad flight controller. <description>Available operating modes/statuses for AutoQuad flight controller.
Bitmask up to 32 bits. Low side bits for base modes, high side for Bitmask up to 32 bits. Low side bits for base modes, high side for
...@@ -10,48 +14,80 @@ ...@@ -10,48 +14,80 @@
<entry value="0" name="AQ_NAV_STATUS_INIT"> <entry value="0" name="AQ_NAV_STATUS_INIT">
<description>System is initializing</description> <description>System is initializing</description>
</entry> </entry>
<!-- low side basic mode bits --> <!-- active modes -->
<entry value="0x1" name="AQ_NAV_STATUS_STANDBY"> <entry value="0x00000001" name="AQ_NAV_STATUS_STANDBY">
<description>System is standing by, not active</description> <description>System is *armed* and standing by, with no throttle input and no autonomous mode</description>
</entry> </entry>
<entry value="0x2" name="AQ_NAV_STATUS_MANUAL"> <entry value="0x00000002" name="AQ_NAV_STATUS_MANUAL">
<description>Stabilized, under full manual control</description> <description>Flying (throttle input detected), assumed under manual control unless other mode bits are set</description>
</entry> </entry>
<entry value="0x4" name="AQ_NAV_STATUS_ALTHOLD"> <entry value="0x00000004" name="AQ_NAV_STATUS_ALTHOLD">
<description>Altitude hold engaged</description> <description>Altitude hold engaged</description>
</entry> </entry>
<entry value="0x8" name="AQ_NAV_STATUS_POSHOLD"> <entry value="0x00000008" name="AQ_NAV_STATUS_POSHOLD">
<description>Position hold engaged</description> <description>Position hold engaged</description>
</entry> </entry>
<entry value="0x10" name="AQ_NAV_STATUS_DVH"> <entry value="0x00000010" name="AQ_NAV_STATUS_GUIDED">
<description>Dynamic Velocity Hold is active</description> <description>Externally-guided (eg. GCS) navigation mode</description>
</entry> </entry>
<entry value="0x20" name="AQ_NAV_STATUS_MISSION"> <entry value="0x00000020" name="AQ_NAV_STATUS_MISSION">
<description>Autonomous mission execution mode</description> <description>Autonomous mission execution mode</description>
</entry> </entry>
<!-- pre-flight -->
<entry value="0x00000100" name="AQ_NAV_STATUS_READY">
<description>Ready but *not armed*</description>
</entry>
<entry value="0x00000200" name="AQ_NAV_STATUS_CALIBRATING">
<description>Calibration mode active</description>
</entry>
<!-- alerts -->
<entry value="0x00001000" name="AQ_NAV_STATUS_NO_RC">
<description>No valid control input (eg. no radio link)</description>
</entry>
<entry value="0x00002000" name="AQ_NAV_STATUS_FUEL_LOW">
<description>Battery is low (stage 1 warning)</description>
</entry>
<entry value="0x00004000" name="AQ_NAV_STATUS_FUEL_CRITICAL">
<description>Battery is depleted (stage 2 warning)</description>
</entry>
<!-- high side feature/modifier/constraint bits (0x8000 0000 = bit 32) --> <!-- high side feature/modifier/constraint bits (0x8000 0000 = bit 32) -->
<entry value="0x80000000" name="AQ_NAV_STATUS_FAILSAFE"> <entry value="0x01000000" name="AQ_NAV_STATUS_DVH">
<description>System is in failsafe recovery mode</description> <description>Dynamic Velocity Hold is active (PH with proportional manual direction override)</description>
</entry> </entry>
<entry value="0x40000000" name="AQ_NAV_STATUS_RTH"> <entry value="0x02000000" name="AQ_NAV_STATUS_DAO">
<description>Automatic Return to Home is active</description> <description>ynamic Altitude Override is active (AH with proportional manual adjustment)</description>
</entry> </entry>
<entry value="0x20000000" name="AQ_NAV_STATUS_HF_LOCKED">
<description>Heading-Free locked mode active</description> <entry value="0x04000000" name="AQ_NAV_STATUS_CEILING_REACHED">
<description>Craft is at ceiling altitude</description>
</entry>
<entry value="0x08000000" name="AQ_NAV_STATUS_CEILING">
<description>Ceiling altitude is set</description>
</entry> </entry>
<entry value="0x10000000" name="AQ_NAV_STATUS_HF_DYNAMIC"> <entry value="0x10000000" name="AQ_NAV_STATUS_HF_DYNAMIC">
<description>Heading-Free dynamic mode active</description> <description>Heading-Free dynamic mode active</description>
</entry> </entry>
<entry value="0x8000000" name="AQ_NAV_STATUS_CEILING"> <entry value="0x20000000" name="AQ_NAV_STATUS_HF_LOCKED">
<description>Ceiling altitude is set</description> <description>Heading-Free locked mode active</description>
</entry> </entry>
<entry value="0x4000000" name="AQ_NAV_STATUS_CEILING_REACHED"> <entry value="0x40000000" name="AQ_NAV_STATUS_RTH">
<description>Craft is at ceiling altitude</description> <description>Automatic Return to Home is active</description>
</entry>
<entry value="0x80000000" name="AQ_NAV_STATUS_FAILSAFE">
<description>System is in failsafe recovery mode</description>
</entry> </entry>
</enum> </enum>
<enum name="MAV_CMD"> <enum name="MAV_CMD">
<!-- TODO: value 1 reserved for now due to legacy code --> <entry value="1" name="MAV_CMD_AQ_NAV_LEG_ORBIT">
<description>Orbit a waypoint.</description>
<param index="1">Orbit radius in meters</param>
<param index="2">Loiter time in decimal seconds</param>
<param index="3">Maximum horizontal speed in m/s</param>
<param index="4">Desired yaw angle at waypoint</param>
<param index="5">Latitude</param>
<param index="6">Longitude</param>
<param index="7">Altitude</param>
</entry>
<entry value="2" name="MAV_CMD_AQ_TELEMETRY"> <entry value="2" name="MAV_CMD_AQ_TELEMETRY">
<description>Start/stop AutoQuad telemetry values stream.</description> <description>Start/stop AutoQuad telemetry values stream.</description>
<param index="1">Start or stop (1 or 0)</param> <param index="1">Start or stop (1 or 0)</param>
...@@ -62,16 +98,7 @@ ...@@ -62,16 +98,7 @@
<param index="6">Empty</param> <param index="6">Empty</param>
<param index="7">Empty</param> <param index="7">Empty</param>
</entry> </entry>
<entry value="3" name="MAV_CMD_AQ_FOLLOW"> <!-- <entry value="3" name="MAV_CMD_AQ_FOLLOW"><description>unused, removed</description></entry> -->
<description>Command AutoQuad to go to a particular place at a set speed.</description>
<param index="1">Latitude</param>
<param index="2">Lontitude</param>
<param index="3">Altitude</param>
<param index="4">Speed</param>
<param index="5">Empty</param>
<param index="6">Empty</param>
<param index="7">Empty</param>
</entry>
<entry value="4" name="MAV_CMD_AQ_REQUEST_VERSION"> <entry value="4" name="MAV_CMD_AQ_REQUEST_VERSION">
<description>Request AutoQuad firmware version number.</description> <description>Request AutoQuad firmware version number.</description>
<param index="1">Empty</param> <param index="1">Empty</param>
...@@ -85,7 +112,7 @@ ...@@ -85,7 +112,7 @@
</enum> </enum>
<!-- extend MAV_DATA_STREAM --> <!-- extend MAV_DATA_STREAM -->
<enum name="MAV_DATA_STREAM"> <enum name="MAV_DATA_STREAM">
<entry value="13" name="MAV_DATA_STREAM_PROPULSION"> <entry name="MAV_DATA_STREAM_PROPULSION">
<description>Motor/ESC telemetry data.</description> <description>Motor/ESC telemetry data.</description>
</entry> </entry>
</enum> </enum>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 28 2016" #define MAVLINK_BUILD_DATE "Fri Apr 01 2016"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.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