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

re-enable the AP_Mount build

This commit is contained in:
Andrew Tridgell 2012-06-04 19:30:33 +10:00
parent 14be88dd55
commit 25c17a5425
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduPlane/ArduPlane.pde
View File

@ -54,8 +54,7 @@ version 2.1 of the License, or (at your option) any later version.
#include <GCS_MAVLink.h> // MAVLink GCS definitions #include <GCS_MAVLink.h> // MAVLink GCS definitions
// AP_Mount disabled until it works with MAVLink10 #include <AP_Mount.h> // Camera/Antenna mount
// #include <AP_Mount.h> // Camera/Antenna mount
// Local modules // Local modules
#include "defines.h" #include "defines.h"

2
Tools/scripts/build_all.sh
View File

@ -8,7 +8,7 @@ set -x
echo "Testing ArduPlane build" echo "Testing ArduPlane build"
pushd ArduPlane pushd ArduPlane
for b in all apm2 apm2beta hil hilsensors mavlink10 mavlink09 sitl sitl-mavlink10 sitl-mavlink09; do for b in all apm2 apm2beta hil hilsensors mavlink10 mavlink09 sitl sitl-mavlink10 sitl-mavlink09 sitl-mount; do
pwd pwd
make clean make clean
make $b make $b

7
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -12,6 +12,11 @@
// 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
#ifndef MAVLINK10
// default to MAVLINK 1.0
#define MAVLINK10 ENABLED
#endif
#if MAVLINK10 == ENABLED #if MAVLINK10 == ENABLED
# include "include/mavlink/v1.0/ardupilotmega/version.h" # include "include/mavlink/v1.0/ardupilotmega/version.h"
#else #else
@ -119,7 +124,7 @@ static inline int comm_get_txspace(mavlink_channel_t chan)
} }
#define MAVLINK_USE_CONVENIENCE_FUNCTIONS #define MAVLINK_USE_CONVENIENCE_FUNCTIONS
#if MAVLINK10==1 #if MAVLINK10==ENABLED
# 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"