From 7e7c21d114631784dd53cc00c8cfdd01c9e3468c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 16 May 2016 15:16:03 +1000 Subject: [PATCH] waf: update for MAVLink2 build --- Tools/ardupilotwaf/mavgen.py | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/ardupilotwaf/mavgen.py b/Tools/ardupilotwaf/mavgen.py index 94886c1763..d4f6dfbb7b 100644 --- a/Tools/ardupilotwaf/mavgen.py +++ b/Tools/ardupilotwaf/mavgen.py @@ -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: diff --git a/wscript b/wscript index eb21594961..44e4bd0646 100644 --- a/wscript +++ b/wscript @@ -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