aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: fixed the -e option for sim_vehicle.sh

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-21 21:16:32 +10:00
parent 605b8b4ece
commit 4c96ec26e5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/autotest/sim_vehicle.sh
View File

@ -339,9 +339,11 @@ EOF
PARMS="ArduPlane.parm" PARMS="ArduPlane.parm"
if [ "$FRAME" = "CRRCSim" ]; then if [ "$FRAME" = "CRRCSim" ]; then
RUNSIM="nice $autotest/pysim/sim_wrapper.py --frame=CRRCSim --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT $EXTRA_SIM" RUNSIM="nice $autotest/pysim/sim_wrapper.py --frame=CRRCSim --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT $EXTRA_SIM"
else elif [ $EXTERNAL_SIM == 0 ]; then
RUNSIM="" RUNSIM=""
cmd="$cmd --model jsbsim --speedup=$SPEEDUP" cmd="$cmd --model jsbsim --speedup=$SPEEDUP"
else
echo "Using external plane simulator"
fi fi
;; ;;
ArduCopter) ArduCopter)
@ -378,7 +380,9 @@ fi
trap kill_tasks SIGINT trap kill_tasks SIGINT
if test -n "$RUNSIM"; then echo "RUNSIM: $RUNSIM"
if [ -n "$RUNSIM" -o "$EXTERNAL_SIM" == 1 ]; then
sleep 2 sleep 2
rm -f $tfile rm -f $tfile
if [ $EXTERNAL_SIM == 0 ]; then if [ $EXTERNAL_SIM == 0 ]; then
@ -396,6 +400,8 @@ if test -n "$RUNSIM"; then
} }
sleep 2 sleep 2
fi fi
else
echo "not running external simulator"
fi fi
# mavproxy.py --master tcp:127.0.0.1:5760 --sitl 127.0.0.1:5501 --out 127.0.0.1:14550 --out 127.0.0.1:14551 # mavproxy.py --master tcp:127.0.0.1:5760 --sitl 127.0.0.1:5501 --out 127.0.0.1:14550 --out 127.0.0.1:14551