mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-27 18:27:05 +08:00
px4-rc.simulator support launching new Gazebo Garden vs Fortress (#20864)
- "ign gazebo" command is now "gz sim" as of Gazebo Garden
This commit is contained in:
@@ -27,8 +27,25 @@ elif [ "$PX4_SIMULATOR" = "gz" ]; then
|
|||||||
. ../gazebo_env.sh
|
. ../gazebo_env.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gz_command="ign" # "ign" before garden
|
# "gz sim" only avaiilable in Garden and later
|
||||||
gz_sub_command="gazebo" # "gazebo" before garden
|
GZ_SIM_VERSIONS=$(gz sim --versions 2>&1)
|
||||||
|
if [ $? -eq 0 ]
|
||||||
|
then
|
||||||
|
# "gz sim" from Garden on
|
||||||
|
gz_command="gz"
|
||||||
|
gz_sub_command="sim"
|
||||||
|
else
|
||||||
|
IGN_GAZEBO_VERSIONS=$(ign gazebo --versions 2>&1)
|
||||||
|
if [ $? -eq 0 ]
|
||||||
|
then
|
||||||
|
# "ign gazebo" for Fortress and earlier
|
||||||
|
gz_command="ign"
|
||||||
|
gz_sub_command="gazebo"
|
||||||
|
else
|
||||||
|
echo "ERROR [init] Gazebo gz and ign commands unavailable"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# look for running ${gz_command} gazebo world
|
# look for running ${gz_command} gazebo world
|
||||||
gz_world=$( ${gz_command} topic -l | grep -m 1 -e "/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
|
gz_world=$( ${gz_command} topic -l | grep -m 1 -e "/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
|
||||||
@@ -41,8 +58,8 @@ elif [ "$PX4_SIMULATOR" = "gz" ]; then
|
|||||||
${gz_command} ${gz_sub_command} --verbose=1 -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
|
${gz_command} ${gz_sub_command} --verbose=1 -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
|
||||||
|
|
||||||
if [ -z "${HEADLESS}" ]; then
|
if [ -z "${HEADLESS}" ]; then
|
||||||
# HEADLESS not set, starting ign gazebo gui
|
# HEADLESS not set, starting gui
|
||||||
${gz_command} gazebo -g &
|
${gz_command} ${gz_sub_command} -g &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@@ -71,7 +88,7 @@ elif [ "$PX4_SIMULATOR" = "gz" ]; then
|
|||||||
sensor_mag_sim start
|
sensor_mag_sim start
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "ERROR [init] gazebo failed to start"
|
echo "ERROR [init] gz_bridge failed to start"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -84,7 +101,7 @@ elif [ "$PX4_SIMULATOR" = "gz" ]; then
|
|||||||
sensor_mag_sim start
|
sensor_mag_sim start
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "ERROR [init] gazebo failed to start"
|
echo "ERROR [init] gz_bridge failed to start"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -98,7 +115,7 @@ elif [ "$PX4_SIMULATOR" = "gz" ]; then
|
|||||||
sensor_mag_sim start
|
sensor_mag_sim start
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "ERROR [init] gazebo failed to start"
|
echo "ERROR [init] gz_bridge failed to start"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user