Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 17:38:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

MAVLink: make usage of MAVLink defines more consistent

Browse Source
This commit is contained in:
Andrew Tridgell 2012-06-15 16:27:02 +10:00
parent 957d818eb7
commit 5525180814
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArduCopter/Makefile
View File

@ -22,10 +22,10 @@ apm2:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2"
apm2-mavlink10: apm2-mavlink10:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=1" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=ENABLED"
apm2-mavlink09: apm2-mavlink09:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=0" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=DISABLED"
apm2hexa: apm2hexa:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DFRAME_CONFIG=HEXA_FRAME" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DFRAME_CONFIG=HEXA_FRAME"
@ -34,19 +34,19 @@ apm2beta:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DAPM2_BETA_HARDWARE" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DAPM2_BETA_HARDWARE"
mavlink10: mavlink10:
make -f Makefile EXTRAFLAGS="-DMAVLINK10=1" make -f Makefile EXTRAFLAGS="-DMAVLINK10=ENABLED"
mavlink09: mavlink09:
make -f Makefile EXTRAFLAGS="-DMAVLINK10=0" make -f Makefile EXTRAFLAGS="-DMAVLINK10=DISABLED"
sitl: sitl:
make -f ../libraries/Desktop/Makefile.desktop make -f ../libraries/Desktop/Makefile.desktop
sitl-mavlink10: sitl-mavlink10:
make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=1" make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=ENABLED"
sitl-mavlink09: sitl-mavlink09:
make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=0" make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=DISABLED"
sitl-octa: sitl-octa:
make -f ../libraries/Desktop/Makefile.desktop octa make -f ../libraries/Desktop/Makefile.desktop octa

3
ArduPlane/APM_Config.h
View File

@ -28,6 +28,3 @@
*/ */
// use this to enable the new MAVLink 1.0 protocol, instead of the
// older 0.9 protocol
// #define MAVLINK10 ENABLED

12
ArduPlane/Makefile
View File

@ -35,25 +35,25 @@ apm2beta:
apm2-mavlink10: apm2-mavlink10:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=1" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=ENABLED"
apm2-mavlink09: apm2-mavlink09:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=0" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DMAVLINK10=DISABLED"
mavlink10: mavlink10:
make -f Makefile EXTRAFLAGS="-DMAVLINK10=1" make -f Makefile EXTRAFLAGS="-DMAVLINK10=ENABLED"
mavlink09: mavlink09:
make -f Makefile EXTRAFLAGS="-DMAVLINK10=0" make -f Makefile EXTRAFLAGS="-DMAVLINK10=DISABLED"
sitl: sitl:
make -f ../libraries/Desktop/Makefile.desktop make -f ../libraries/Desktop/Makefile.desktop
sitl-mavlink10: sitl-mavlink10:
make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=1" make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=ENABLED"
sitl-mavlink09: sitl-mavlink09:
make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=0" make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMAVLINK10=DISABLED"
sitl-mount: sitl-mount:
make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMOUNT=ENABLED" make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMOUNT=ENABLED"