Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: generate after move of PARACHUTE_ACTION

This commit is contained in:
Randy Mackay 2014-09-17 15:56:00 +09:00
parent 868f1a777d
commit 6b38547fc2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
View File

@ -140,18 +140,6 @@ typedef enum RALLY_FLAGS
} RALLY_FLAGS; } RALLY_FLAGS;
#endif #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 */ /** @brief */
#ifndef HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE #ifndef HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE
#define HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE #define HAVE_ENUM_MOTOR_TEST_THROTTLE_TYPE

12
libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h
View File

@ -349,6 +349,18 @@ typedef enum MAV_ROI
} MAV_ROI; } MAV_ROI;
#endif #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. */ /** @brief ACK / NACK / ERROR values as a result of MAV_CMDs and for mission item transmission. */
#ifndef HAVE_ENUM_MAV_CMD_ACK #ifndef HAVE_ENUM_MAV_CMD_ACK
#define HAVE_ENUM_MAV_CMD_ACK #define HAVE_ENUM_MAV_CMD_ACK