From 68515d03249525742606984f148545e61caaabaa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 May 2015 11:26:54 +1000 Subject: [PATCH] autotest: fixed CopterAVC test --- Tools/autotest/arducopter.py | 2 +- Tools/autotest/pysim/util.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index fe84fa1ce9..809fef3a15 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -1271,7 +1271,7 @@ def fly_CopterAVC(viewerip=None, map=False): util.pexpect_close(mavproxy) util.pexpect_close(sil) - sil = util.start_SIL('ArduCopter', height=HOME.alt, model='+', home=home, speedup=10) + sil = util.start_SIL('ArduCopter', model='+', home=home, speedup=10) options = '--sitl=127.0.0.1:5501 --out=127.0.0.1:19550 --quadcopter --streamrate=5' if viewerip: options += ' --out=%s:14550' % viewerip diff --git a/Tools/autotest/pysim/util.py b/Tools/autotest/pysim/util.py index e49d1528d3..8fda1494e0 100644 --- a/Tools/autotest/pysim/util.py +++ b/Tools/autotest/pysim/util.py @@ -105,7 +105,7 @@ def pexpect_drain(p): except pexpect.TIMEOUT: pass -def start_SIL(atype, valgrind=False, wipe=False, height=None, synthetic_clock=True, home=None, model=None, speedup=1): +def start_SIL(atype, valgrind=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1): '''launch a SIL instance''' import pexpect cmd="" @@ -117,8 +117,6 @@ def start_SIL(atype, valgrind=False, wipe=False, height=None, synthetic_clock=Tr cmd += executable if wipe: cmd += ' -w' - if height is not None: - cmd += ' -H %u' % height if synthetic_clock: cmd += ' -S' if home is not None: