Skip to content
Snippets Groups Projects
Commit 55251808 authored by Andrew Tridgell's avatar Andrew Tridgell
Browse files

MAVLink: make usage of MAVLink defines more consistent

parent 957d818e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ArduCopter/Makefile
+ 6
− 6
View file @ 55251808
...@@ -22,10 +22,10 @@ apm2: ...@@ -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: ...@@ -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
......
ArduPlane/APM_Config.h
+ 0
− 3
View file @ 55251808
...@@ -28,6 +28,3 @@ ...@@ -28,6 +28,3 @@
*/ */
// use this to enable the new MAVLink 1.0 protocol, instead of the
// older 0.9 protocol
// #define MAVLINK10 ENABLED
ArduPlane/Makefile
+ 6
− 6
View file @ 55251808
...@@ -35,25 +35,25 @@ apm2beta: ...@@ -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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment