Skip to content

Feature/kill gzserver #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nyxrobotics wants to merge 8 commits into
base: noetic-devel
Choose a base branch
from
Draft

Feature/kill gzserver #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
793edde
Add ahcorde as maintainer (noetic-devel) (#1437)
Nov 21, 2022
8583aec
gazebo_ros_ft_sensor: Fix incorrect 'imu' with 'ft_sensor' (#1436)
wxmerkt Nov 22, 2022
75ec16b
gazebo_ros: fix killing the gzserver after the client terminated with…
meyerj Feb 2, 2023
b8193d1
gazebo_ros: do not load the gazebo_ros_api_plugin into the gzclient
meyerj Feb 2, 2023
398cde9
Fix typo OpenCV_LIBRARIES (#1451)
Tobias-Fischer Feb 2, 2023
85ed7d4
Merge remote-tracking branch 'origin/noetic-devel' into fix/kill-gzse…
meyerj Jul 7, 2023
a7f957c
Restore gazebo packages to build
Jun 18, 2024
74098f0
Merge branch 'fix/kill-gzserver' into feature/kill-gzserver
Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed gazebo_dev/CATKIN_IGNORE
View file
Open in desktop
Empty file.
5 changes: 3 additions & 2 deletions gazebo_dev/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@
Provides a cmake config for the default version of Gazebo for the ROS distribution.
</description>

<maintainer email="hsu@osrfoundation.org">John Hsu</maintainer>
<maintainer email="davetcoleman@gmail.com">Dave Coleman</maintainer>
<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>

<license>Apache 2.0</license>

<url type="website">http://gazebosim.org/tutorials?cat=connect_ros</url>
<url type="bugtracker">https://github.com/ros-simulation/gazebo_ros_pkgs/issues</url>
<url type="repository">https://github.com/ros-simulation/gazebo_ros_pkgs</url>

<author>Dave Coleman</author>
<author>John Hsu</author>
<author>Johannes Meyer</author>

<buildtool_depend>catkin</buildtool_depend>
Expand Down
Empty file removed gazebo_msgs/CATKIN_IGNORE
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gazebo_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Message and service data structures for interacting with Gazebo from ROS.
</description>

<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer>

<license>BSD</license>
Expand Down
2 changes: 1 addition & 1 deletion gazebo_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ add_library(gazebo_ros_skid_steer_drive src/gazebo_ros_skid_steer_drive.cpp)
target_link_libraries(gazebo_ros_skid_steer_drive ${catkin_LIBRARIES} ${Boost_LIBRARIES})

add_library(gazebo_ros_video src/gazebo_ros_video.cpp)
target_link_libraries(gazebo_ros_video ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OGRE_LIBRARIES} ${opencv_LIBRARIES})
target_link_libraries(gazebo_ros_video ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OGRE_LIBRARIES} ${OpenCV_LIBRARIES})

add_library(gazebo_ros_planar_move src/gazebo_ros_planar_move.cpp)
target_link_libraries(gazebo_ros_planar_move ${catkin_LIBRARIES} ${Boost_LIBRARIES})
Expand Down
1 change: 1 addition & 0 deletions gazebo_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.
</description>

<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer>

<license>BSD, Apache 2.0</license>
Expand Down
2 changes: 1 addition & 1 deletion gazebo_plugins/src/gazebo_ros_ft_sensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void GazeboRosFT::Load( physics::ModelPtr _model, sdf::ElementPtr _sdf )

if (!_sdf->HasElement("gaussianNoise"))
{
ROS_INFO_NAMED("ft_sensor", "imu plugin missing <gaussianNoise>, defaults to 0.0");
ROS_INFO_NAMED("ft_sensor", "ft_sensor plugin missing <gaussianNoise>, defaults to 0.0");
this->gaussian_noise_ = 0.0;
}
else
Expand Down
Empty file removed gazebo_ros/CATKIN_IGNORE
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gazebo_ros/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Formally simulator_gazebo/gazebo
</description>

<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer>

<license>Apache 2.0</license>
Expand Down
2 changes: 1 addition & 1 deletion gazebo_ros/scripts/debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ then
fi

setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
. $setup_path/setup.sh && rosrun gazebo_ros gdbrun gzserver $final
. $setup_path/setup.sh && exec rosrun gazebo_ros gdbrun gzserver $final
4 changes: 2 additions & 2 deletions gazebo_ros/scripts/gazebo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if $(kill -0 $! 2> /dev/null); then
fi

# Kill the server if it is alive
if $(kill -0 $! 2> /dev/null); then
if $(kill -0 $gzserver_pid 2> /dev/null); then
# -2 SIGINT valid for Linux and Mac
kill -2 $!
kill -2 $gzserver_pid
fi
8 changes: 1 addition & 7 deletions gazebo_ros/scripts/gzclient
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ then
final="$final -g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
fi

# add ros api plugin if it does not already exist in the passed in arguments
if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
then
final="$final -g `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
fi

setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/

# source setup.sh, but keep local modifications to GAZEBO_MASTER_URI and GAZEBO_MODEL_DATABASE_URI
Expand All @@ -39,4 +33,4 @@ fi
final=$(relocate_remappings "${final}")

# Combine the commands
GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" gzclient $final
GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" exec gzclient $final
2 changes: 1 addition & 1 deletion gazebo_ros/scripts/gzserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ fi

final=$(relocate_remappings "${final}")

GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" gzserver $final
GAZEBO_MASTER_URI="$desired_master_uri" GAZEBO_MODEL_DATABASE_URI="$desired_model_database_uri" exec gzserver $final
2 changes: 1 addition & 1 deletion gazebo_ros/scripts/perf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ then
fi

setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
. $setup_path/setup.sh && /usr/bin/valgrind --tool=callgrind gzserver $final
. $setup_path/setup.sh && exec /usr/bin/valgrind --tool=callgrind gzserver $final
1 change: 1 addition & 0 deletions gazebo_ros_control/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<version>2.9.2</version>
<description>gazebo_ros_control</description>

<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer>

<license>BSD</license>
Expand Down
Empty file removed gazebo_ros_pkgs/CATKIN_IGNORE
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gazebo_ros_pkgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<version>2.9.2</version>
<description>Interface for using ROS with the <a href="http://gazebosim.org/">Gazebo</a> simulator.</description>

<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernández Cordero</maintainer>
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer>

<license>BSD,LGPL,Apache 2.0</license>
Expand Down