waf: update for MAVLink2 build

This commit is contained in:
Andrew Tridgell 2016-05-16 15:16:03 +10:00
parent 16901ffb2b
commit 7e7c21d114
2 changed files with 2 additions and 2 deletions

View File

@ -55,7 +55,7 @@ class mavgen(Task.Task):
mavgen = self.env.get_flat('MAVGEN')
out = self.env.get_flat('OUTPUT_DIR')
src = self.env.get_flat('SRC')
ret = self.exec_command('{} {} --lang=C --wire-protocol=1.0 --output {} {}'.format(
ret = self.exec_command('{} {} --lang=C --wire-protocol=2.0 --output {} {}'.format(
python, mavgen, out, self.inputs[0].abspath()))
if ret != 0:

View File

@ -166,7 +166,7 @@ def _build_dynamic_sources(bld):
bld(
features='mavgen',
source='modules/mavlink/message_definitions/v1.0/ardupilotmega.xml',
output_dir='libraries/GCS_MAVLink/include/mavlink/v1.0/',
output_dir='libraries/GCS_MAVLink/include/mavlink/v2.0/',
name='mavlink',
# this below is not ideal, mavgen tool should set this, but that's not
# currently possible