From 6b38547fc2659dba2a6b4ee2652f8905a32e315a Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 17 Sep 2014 15:56:00 +0900 Subject: [PATCH] GCS_MAVLink: generate after move of PARACHUTE_ACTION --- .../mavlink/v1.0/ardupilotmega/ardupilotmega.h | 12 ------------ .../GCS_MAVLink/include/mavlink/v1.0/common/common.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h index dbc085a827..785ac05a64 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h @@ -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 diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h index 5202cb8aee..6db9eb48c7 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h @@ -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