From 0049351f2f7a4cce89e221b963ab257e38983f96 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 21 Oct 2013 22:20:57 +0900 Subject: [PATCH] GCS_MAVLink: generate after adding RC reciever to SYS_STATUS enum --- .../include/mavlink/v1.0/ardupilotmega/version.h | 2 +- libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h | 3 ++- libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h | 2 +- .../GCS_MAVLink/include/mavlink/v1.0/mavlink_conversions.h | 6 +----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h index cb8242a7f8..7c6028c353 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h @@ -5,7 +5,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Fri Oct 11 21:12:15 2013" +#define MAVLINK_BUILD_DATE "Mon Oct 21 22:18:41 2013" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 254 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 3755e5d90b..0af414e91a 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h @@ -222,7 +222,8 @@ enum MAV_SYS_STATUS_SENSOR MAV_SYS_STATUS_SENSOR_Z_ALTITUDE_CONTROL=8192, /* 0x2000 z/altitude control | */ MAV_SYS_STATUS_SENSOR_XY_POSITION_CONTROL=16384, /* 0x4000 x/y position control | */ MAV_SYS_STATUS_SENSOR_MOTOR_OUTPUTS=32768, /* 0x8000 motor outputs / control | */ - MAV_SYS_STATUS_SENSOR_ENUM_END=32769, /* | */ + MAV_SYS_STATUS_SENSOR_RC_RECEIVER=65536, /* 0x10000 rc receiver | */ + MAV_SYS_STATUS_SENSOR_ENUM_END=65537, /* | */ }; #endif diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h index 72ee7dc16f..c619a8457a 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h @@ -5,7 +5,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Fri Oct 11 21:12:15 2013" +#define MAVLINK_BUILD_DATE "Mon Oct 21 22:18:41 2013" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 254 diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_conversions.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_conversions.h index 55a79728e5..d893635770 100644 --- a/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_conversions.h +++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_conversions.h @@ -9,10 +9,6 @@ #endif #include -#ifndef M_PI_2 - #define M_PI_2 ((float)asin(1)) -#endif - /** * @file mavlink_conversions.h * @@ -132,4 +128,4 @@ MAVLINK_HELPER void mavlink_euler_to_dcm(float roll, float pitch, float yaw, flo dcm[2][2] = cosPhi * cosThe; } -#endif +#endif \ No newline at end of file