diff --git a/Tools/jMAVSim b/Tools/jMAVSim index dc10a13c78..883413f8b9 160000 --- a/Tools/jMAVSim +++ b/Tools/jMAVSim @@ -1 +1 @@ -Subproject commit dc10a13c78afeb97f7b570f8049ec8a912e22d81 +Subproject commit 883413f8b97cc53d48491d6ff3630d6efd2e2467 diff --git a/Tools/jmavsim_run.sh b/Tools/jmavsim_run.sh index 18c92485c1..a974edee27 100755 --- a/Tools/jmavsim_run.sh +++ b/Tools/jmavsim_run.sh @@ -33,9 +33,6 @@ while getopts ":b:d:p:qsr:f:i:l" opt; do r) extra_args="$extra_args -r $OPTARG" ;; - f) - extra_args="$extra_args -f $OPTARG" - ;; l) extra_args="$extra_args -lockstep" ;; diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh index de806fc332..985bd6250f 100755 --- a/Tools/sitl_run.sh +++ b/Tools/sitl_run.sh @@ -63,16 +63,9 @@ done SIM_PID=0 -# Allow speed factor to bet set from environment. -if [[ -n "$PX4_SIM_SPEED_FACTOR" ]]; then - speed_factor=$PX4_SIM_SPEED_FACTOR -else - speed_factor=1 -fi - if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]; then # Start Java simulator - "$src_path"/Tools/jmavsim_run.sh -r 250 -f $speed_factor -l & + "$src_path"/Tools/jmavsim_run.sh -r 250 -l & SIM_PID=`echo $!` elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then if [ -x "$(command -v gazebo)" ]; then