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

Mavlink: fixed library build for MAVLink 1.0

This commit is contained in:
Andrew Tridgell 2012-06-04 13:14:05 +10:00
parent 34234b7003
commit 4f7a80a04d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -12,7 +12,7 @@
// to select MAVLink 1.0 in the arduino GUI build // to select MAVLink 1.0 in the arduino GUI build
//#define MAVLINK_SEPARATE_HELPERS //#define MAVLINK_SEPARATE_HELPERS
#ifdef MAVLINK10 #if MAVLINK10 == ENABLED
# include "include/mavlink/v1.0/ardupilotmega/version.h" # include "include/mavlink/v1.0/ardupilotmega/version.h"
#else #else
# include "include/mavlink/v0.9/ardupilotmega/version.h" # include "include/mavlink/v0.9/ardupilotmega/version.h"
@ -22,7 +22,7 @@
#define MAVLINK_MAX_PAYLOAD_LEN MAVLINK_MAX_DIALECT_PAYLOAD_SIZE #define MAVLINK_MAX_PAYLOAD_LEN MAVLINK_MAX_DIALECT_PAYLOAD_SIZE
#define MAVLINK_COMM_NUM_BUFFERS 2 #define MAVLINK_COMM_NUM_BUFFERS 2
#ifdef MAVLINK10 #if MAVLINK10==ENABLED
# include "include/mavlink/v1.0/mavlink_types.h" # include "include/mavlink/v1.0/mavlink_types.h"
#else #else
# include "include/mavlink/v0.9/mavlink_types.h" # include "include/mavlink/v0.9/mavlink_types.h"
@ -119,7 +119,7 @@ static inline int comm_get_txspace(mavlink_channel_t chan)
} }
#define MAVLINK_USE_CONVENIENCE_FUNCTIONS #define MAVLINK_USE_CONVENIENCE_FUNCTIONS
#ifdef MAVLINK10 #if MAVLINK10==1
# include "include/mavlink/v1.0/ardupilotmega/mavlink.h" # include "include/mavlink/v1.0/ardupilotmega/mavlink.h"
#else #else
# include "include/mavlink/v0.9/ardupilotmega/mavlink.h" # include "include/mavlink/v0.9/ardupilotmega/mavlink.h"

2
libraries/GCS_MAVLink/Mavlink_compat.h
View File

@ -2,7 +2,7 @@
compatibility header during transition to MAVLink 1.0 compatibility header during transition to MAVLink 1.0
*/ */
#ifdef MAVLINK10 #if MAVLINK10==1
// in MAVLink 1.0 'waypoint' becomes 'mission'. We can remove these // in MAVLink 1.0 'waypoint' becomes 'mission'. We can remove these
// mappings once we are not trying to support both protocols // mappings once we are not trying to support both protocols