yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentation in run script and update submodule

Browse Source
This commit is contained in:
JaeyoungLim
2020-03-23 10:13:50 +01:00
committed by Julian Oes
parent 103bfd0d30
commit 315135c07e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/sitl_gazebo

Submodule Tools/sitl_gazebo updated: dc60f209db...e56ecf388d

22
Tools/sitl_run.sh
View File

@@ -79,8 +79,8 @@ if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]; then
SIM_PID=`echo $!` SIM_PID=`echo $!`
elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then
if [ -x "$(command -v gazebo)" ]; then if [ -x "$(command -v gazebo)" ]; then
# Set the plugin path so Gazebo finds our model and sim # Set the plugin path so Gazebo finds our model and sim
source "$src_path/Tools/setup_gazebo.bash" "${src_path}" "${build_path}" source "$src_path/Tools/setup_gazebo.bash" "${src_path}" "${build_path}"
if [ -z $PX4_SITL_WORLD ]; then if [ -z $PX4_SITL_WORLD ]; then
#Spawn predefined world #Spawn predefined world
if [ "$world" == "none" ]; then if [ "$world" == "none" ]; then
@@ -103,19 +103,19 @@ elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]; then
# Spawn world from environment variable with absolute path # Spawn world from environment variable with absolute path
gzserver "$PX4_SITL_WORLD" & gzserver "$PX4_SITL_WORLD" &
fi 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 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 $!` SIM_PID=`echo $!`
if [[ -n "$HEADLESS" ]]; then if [[ -n "$HEADLESS" ]]; then
echo "not running gazebo gui" echo "not running gazebo gui"
else else
# gzserver needs to be running to avoid a race. Since the launch # 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 # is putting it into the background we need to avoid it by backing off
sleep 3 sleep 3
nice -n 20 gzclient --verbose & nice -n 20 gzclient --verbose &
GUI_PID=`echo $!` GUI_PID=`echo $!`
fi fi
else else
echo "You need to have gazebo simulator installed!" echo "You need to have gazebo simulator installed!"

2
test/mavsdk_tests/waitforgz.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 ..." echo "Gazebo not running yet ..."
done done