autotest: fixed CopterAVC test

This commit is contained in:
Andrew Tridgell 2015-05-11 11:26:54 +10:00
parent 8bf2baef70
commit 68515d0324
2 changed files with 2 additions and 4 deletions

View File

@ -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

View File

@ -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: