Browse Source

GCS_MAVLink: generate after move of PARACHUTE_ACTION

master
Randy Mackay 11 years ago
parent
commit
6b38547fc2
  1. 12
      libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
  2. 12
      libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h

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

@ -140,18 +140,6 @@ typedef enum RALLY_FLAGS @@ -140,18 +140,6 @@ 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

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

@ -349,6 +349,18 @@ typedef enum MAV_ROI @@ -349,6 +349,18 @@ 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

Loading…
Cancel
Save