GCS_MAVLink: re-generated headers

This commit is contained in:
Michael Day 2014-10-17 10:33:17 -07:00 committed by Andrew Tridgell
parent e1a88a13a7
commit d62b9a7044
6 changed files with 24 additions and 21 deletions

View File

@ -1,6 +1,6 @@
/** @file
* @brief MAVLink comm protocol generated from ardupilotmega.xml
* @see http://qgroundcontrol.org/mavlink/
* @see http://mavlink.org
*/
#ifndef MAVLINK_ARDUPILOTMEGA_H
#define MAVLINK_ARDUPILOTMEGA_H
@ -66,6 +66,7 @@ typedef enum MAV_CMD
MAV_CMD_DO_SET_SERVO=183, /* Set a servo to a desired PWM value. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_REPEAT_SERVO=184, /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Cycle count| Cycle time (seconds)| Empty| Empty| Empty| */
MAV_CMD_DO_FLIGHTTERMINATION=185, /* Terminate flight immediately |Flight termination activated if > 0.5| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_LAND_START=189, /* Mission command to perform a landing. This is used as a marker in a mission to tell the autopilot where a sequence of mission items that represents a landing starts. It may also be sent via a COMMAND_LONG to trigger a landing, in which case the nearest (geographically) landing sequence in the mission will be used. The Latitude/Longitude is optional, and may be set to 0/0 if not needed. If specified then it will be used to help find the closest landing sequence. |Empty| Empty| Empty| Empty| Latitude| Longitude| Empty| */
MAV_CMD_DO_RALLY_LAND=190, /* Mission command to perform a landing from a rally point. |Break altitude (meters)| Landing speed (m/s)| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_GO_AROUND=191, /* Mission command to safely abort an autonmous landing. |Altitude (meters)| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_CONTROL_VIDEO=200, /* Control onboard camera system. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds (decimal)| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty| */
@ -141,6 +142,18 @@ typedef enum RALLY_FLAGS
} RALLY_FLAGS;
#endif
/** @brief */
#ifndef HAVE_ENUM_PARACHUTE_ACTION
#define HAVE_ENUM_PARACHUTE_ACTION
typedef enum PARACHUTE_ACTION
{
PARACHUTE_DISABLE=0, /* Disable parachute release | */
PARACHUTE_ENABLE=1, /* Enable parachute release | */
PARACHUTE_RELEASE=2, /* Release parachute | */
PARACHUTE_ACTION_ENUM_END=3, /* | */
} PARACHUTE_ACTION;
#endif
/** @brief */
#ifndef HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE
#define HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE

View File

@ -1,6 +1,6 @@
/** @file
* @brief MAVLink comm protocol built from ardupilotmega.xml
* @see http://pixhawk.ethz.ch/software/mavlink
* @see http://mavlink.org
*/
#ifndef MAVLINK_H
#define MAVLINK_H

View File

@ -1,11 +1,11 @@
/** @file
* @brief MAVLink comm protocol built from ardupilotmega.xml
* @see http://pixhawk.ethz.ch/software/mavlink
* @see http://mavlink.org
*/
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed Sep 17 16:07:19 2014"
#define MAVLINK_BUILD_DATE "Sat Oct 18 12:05:51 2014"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255

View File

@ -1,6 +1,6 @@
/** @file
* @brief MAVLink comm protocol generated from common.xml
* @see http://qgroundcontrol.org/mavlink/
* @see http://mavlink.org
*/
#ifndef MAVLINK_COMMON_H
#define MAVLINK_COMMON_H
@ -84,7 +84,9 @@ typedef enum MAV_TYPE
MAV_TYPE_FLAPPING_WING=16, /* Flapping wing | */
MAV_TYPE_KITE=17, /* Flapping wing | */
MAV_TYPE_ONBOARD_CONTROLLER=18, /* Onboard companion controller | */
MAV_TYPE_ENUM_END=19, /* | */
MAV_TYPE_VTOL_DUOROTOR=19, /* Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter. | */
MAV_TYPE_VTOL_QUADROTOR=20, /* Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter. | */
MAV_TYPE_ENUM_END=21, /* | */
} MAV_TYPE;
#endif
@ -349,18 +351,6 @@ typedef enum MAV_ROI
} MAV_ROI;
#endif
/** @brief */
#ifndef HAVE_ENUM_PARACHUTE_ACTION
#define HAVE_ENUM_PARACHUTE_ACTION
typedef enum PARACHUTE_ACTION
{
PARACHUTE_DISABLE=0, /* Disable parachute release | */
PARACHUTE_ENABLE=1, /* Enable parachute release | */
PARACHUTE_RELEASE=2, /* Release parachute | */
PARACHUTE_ACTION_ENUM_END=3, /* | */
} PARACHUTE_ACTION;
#endif
/** @brief ACK / NACK / ERROR values as a result of MAV_CMDs and for mission item transmission. */
#ifndef HAVE_ENUM_MAV_CMD_ACK
#define HAVE_ENUM_MAV_CMD_ACK

View File

@ -1,6 +1,6 @@
/** @file
* @brief MAVLink comm protocol built from common.xml
* @see http://pixhawk.ethz.ch/software/mavlink
* @see http://mavlink.org
*/
#ifndef MAVLINK_H
#define MAVLINK_H

View File

@ -1,11 +1,11 @@
/** @file
* @brief MAVLink comm protocol built from common.xml
* @see http://pixhawk.ethz.ch/software/mavlink
* @see http://mavlink.org
*/
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Wed Sep 17 16:07:19 2014"
#define MAVLINK_BUILD_DATE "Sat Oct 18 12:05:51 2014"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255