Skip to content

Commit 9f503c8

Browse files
authored
Merge pull request #23 from tomcreutz/tomcreutz-fix-underwater_camera_ros2_node_name
Fixes Underwater Camera Plugin which sets the ROS2 node name statically, which doesn't allow to have multiples
2 parents 0a34dd0 + f53738a commit 9f503c8

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

gazebo/dave_gz_sensor_plugins/src/UnderwaterCamera.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,6 @@ void UnderwaterCamera::Configure(
104104
gzdbg << "dave_gz_sensor_plugins::UnderwaterCamera::Configure on entity: " << _entity
105105
<< std::endl;
106106

107-
if (!rclcpp::ok())
108-
{
109-
rclcpp::init(0, nullptr);
110-
}
111-
112-
this->ros_node_ = std::make_shared<rclcpp::Node>("underwater_camera_node");
113-
114107
auto rgbdCamera = _ecm.Component<gz::sim::components::RgbdCamera>(_entity);
115108
if (!rgbdCamera)
116109
{
@@ -133,6 +126,14 @@ void UnderwaterCamera::Configure(
133126
return;
134127
}
135128

129+
if (!rclcpp::ok())
130+
{
131+
rclcpp::init(0, nullptr);
132+
}
133+
134+
std::string rosNodeName = sensorSdf.Name() + "_node";
135+
this->ros_node_ = std::make_shared<rclcpp::Node>(rosNodeName);
136+
136137
if (this->dataPtr->topic.empty())
137138
{
138139
auto scoped = gz::sim::scopedName(_entity, _ecm);

0 commit comments

Comments
 (0)