Browse Source

jMAVSim: update submodule for new -f argument

This adds the argument -f for a speed factor to speed up the simulation.
sbg
Julian Oes 6 years ago
parent
commit
82a88d6a53
  1. 2
      Tools/jMAVSim
  2. 5
      Tools/jmavsim_run.sh
  3. 2
      Tools/sitl_run.sh

2
Tools/jMAVSim

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit cb2d13087a671d80a68e65109ff4da307022dea0
Subproject commit 26bf9e6c7416777850f3b40082d51c1fdf12ca1c

5
Tools/jmavsim_run.sh

@ -10,7 +10,7 @@ extra_args= @@ -10,7 +10,7 @@ extra_args=
baudrate=921600
device=
ip="127.0.0.1"
while getopts ":b:d:p:qr:i:" opt; do
while getopts ":b:d:p:qr:f:i:" opt; do
case $opt in
b)
baudrate=$OPTARG
@ -30,6 +30,9 @@ while getopts ":b:d:p:qr:i:" opt; do @@ -30,6 +30,9 @@ while getopts ":b:d:p:qr:i:" opt; do
r)
extra_args="$extra_args -r $OPTARG"
;;
f)
extra_args="$extra_args -f $OPTARG"
;;
\?)
echo "Invalid option: -$OPTARG" >&2
exit 1

2
Tools/sitl_run.sh

@ -69,7 +69,7 @@ SIM_PID=0 @@ -69,7 +69,7 @@ SIM_PID=0
if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]
then
# Start Java simulator
"$src_path"/Tools/jmavsim_run.sh -r 500 &
"$src_path"/Tools/jmavsim_run.sh -r 500 -f 1 &
SIM_PID=`echo $!`
elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]
then

Loading…
Cancel
Save