forked from Archive/PX4-Autopilot
Fix indentation in run script and update submodule
This commit is contained in:
parent
103bfd0d30
commit
315135c07e
|
@ -1 +1 @@
|
|||
Subproject commit dc60f209db24712721dd9481e2244b7b0b35a9db
|
||||
Subproject commit e56ecf388d1c16599772ef5a9044af5d18bb05d0
|
|
@ -79,8 +79,8 @@ if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]; then
|
|||
SIM_PID=`echo $!`
|
||||
elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then
|
||||
if [ -x "$(command -v gazebo)" ]; then
|
||||
# Set the plugin path so Gazebo finds our model and sim
|
||||
source "$src_path/Tools/setup_gazebo.bash" "${src_path}" "${build_path}"
|
||||
# Set the plugin path so Gazebo finds our model and sim
|
||||
source "$src_path/Tools/setup_gazebo.bash" "${src_path}" "${build_path}"
|
||||
if [ -z $PX4_SITL_WORLD ]; then
|
||||
#Spawn predefined world
|
||||
if [ "$world" == "none" ]; then
|
||||
|
@ -103,19 +103,19 @@ elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then
|
|||
# Spawn world from environment variable with absolute path
|
||||
gzserver "$PX4_SITL_WORLD" &
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
gz model --spawn-file="${src_path}/Tools/sitl_gazebo/models/${model}/${model}.sdf" --model-name=${model} -x 1.01 -y 0.98 -z 0.83
|
||||
|
||||
SIM_PID=`echo $!`
|
||||
|
||||
if [[ -n "$HEADLESS" ]]; then
|
||||
echo "not running gazebo gui"
|
||||
else
|
||||
# gzserver needs to be running to avoid a race. Since the launch
|
||||
# is putting it into the background we need to avoid it by backing off
|
||||
sleep 3
|
||||
nice -n 20 gzclient --verbose &
|
||||
GUI_PID=`echo $!`
|
||||
if [[ -n "$HEADLESS" ]]; then
|
||||
echo "not running gazebo gui"
|
||||
else
|
||||
# gzserver needs to be running to avoid a race. Since the launch
|
||||
# is putting it into the background we need to avoid it by backing off
|
||||
sleep 3
|
||||
nice -n 20 gzclient --verbose &
|
||||
GUI_PID=`echo $!`
|
||||
fi
|
||||
else
|
||||
echo "You need to have gazebo simulator installed!"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
while gz stats -d 0 2>&1 | grep "An instance of Gazebo is not running."; do
|
||||
while gz stats -d 0 2>&1 | grep -q "An instance of Gazebo is not running."; do
|
||||
echo "Gazebo not running yet ..."
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue