From ef08550f38e6c5cde92f1a8b2e695f5930ea64ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Fri, 31 May 2024 18:06:34 +0200 Subject: [PATCH 1/4] Updating launch files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_bridge/launch/ros_gz_bridge.launch | 4 +++- ros_gz_sim/launch/ros_gz_sim.launch | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ros_gz_bridge/launch/ros_gz_bridge.launch b/ros_gz_bridge/launch/ros_gz_bridge.launch index f1a99158..180b47bc 100644 --- a/ros_gz_bridge/launch/ros_gz_bridge.launch +++ b/ros_gz_bridge/launch/ros_gz_bridge.launch @@ -1,11 +1,13 @@ + - + @@ -13,7 +14,8 @@ container_name="$(var container_name)" use_composition="$(var use_composition)"> - Date: Fri, 31 May 2024 19:43:00 +0200 Subject: [PATCH 2/4] Name is required. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_bridge/launch/ros_gz_bridge.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros_gz_bridge/launch/ros_gz_bridge.launch b/ros_gz_bridge/launch/ros_gz_bridge.launch index 180b47bc..929c72fe 100644 --- a/ros_gz_bridge/launch/ros_gz_bridge.launch +++ b/ros_gz_bridge/launch/ros_gz_bridge.launch @@ -1,5 +1,5 @@ - + From 1c15ff2fe4257dd3aa98115d47ae7e52ffbd89b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Fri, 31 May 2024 20:00:40 +0200 Subject: [PATCH 3/4] Required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_bridge/src/factory.hpp | 4 ++-- ros_gz_bridge/test/config/full.yaml | 9 +++++++++ ros_gz_sim/launch/ros_gz_sim.launch | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ros_gz_bridge/src/factory.hpp b/ros_gz_bridge/src/factory.hpp index ec00af7b..90707728 100644 --- a/ros_gz_bridge/src/factory.hpp +++ b/ros_gz_bridge/src/factory.hpp @@ -110,9 +110,9 @@ class Factory : public FactoryInterface [this, ros_pub](const GZ_T & _msg, const gz::transport::MessageInfo & _info) { // Ignore messages that are published from this bridge. - if (!_info.IntraProcess()) { + // if (!_info.IntraProcess()) { this->gz_callback(_msg, ros_pub); - } + // } }; node->Subscribe(topic_name, subCb); diff --git a/ros_gz_bridge/test/config/full.yaml b/ros_gz_bridge/test/config/full.yaml index ac838101..90f3a95b 100644 --- a/ros_gz_bridge/test/config/full.yaml +++ b/ros_gz_bridge/test/config/full.yaml @@ -16,3 +16,12 @@ publisher_queue: 20 lazy: false direction: GZ_TO_ROS + +- ros_topic_name: "clock" + gz_topic_name: "clock" + ros_type_name: "rosgraph_msgs/msg/Clock" + gz_type_name: "gz.msgs.Clock" + subscriber_queue: 10 + publisher_queue: 20 + lazy: false + direction: GZ_TO_ROS diff --git a/ros_gz_sim/launch/ros_gz_sim.launch b/ros_gz_sim/launch/ros_gz_sim.launch index 3edfef15..89b048b2 100644 --- a/ros_gz_sim/launch/ros_gz_sim.launch +++ b/ros_gz_sim/launch/ros_gz_sim.launch @@ -1,5 +1,5 @@ - + From e3aa5577b0fbac7ed4132ea735aa5e3aaeeb82ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Fri, 31 May 2024 20:01:22 +0200 Subject: [PATCH 4/4] Restore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_bridge/src/factory.hpp | 4 ++-- ros_gz_bridge/test/config/full.yaml | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ros_gz_bridge/src/factory.hpp b/ros_gz_bridge/src/factory.hpp index 90707728..ec00af7b 100644 --- a/ros_gz_bridge/src/factory.hpp +++ b/ros_gz_bridge/src/factory.hpp @@ -110,9 +110,9 @@ class Factory : public FactoryInterface [this, ros_pub](const GZ_T & _msg, const gz::transport::MessageInfo & _info) { // Ignore messages that are published from this bridge. - // if (!_info.IntraProcess()) { + if (!_info.IntraProcess()) { this->gz_callback(_msg, ros_pub); - // } + } }; node->Subscribe(topic_name, subCb); diff --git a/ros_gz_bridge/test/config/full.yaml b/ros_gz_bridge/test/config/full.yaml index 90f3a95b..ac838101 100644 --- a/ros_gz_bridge/test/config/full.yaml +++ b/ros_gz_bridge/test/config/full.yaml @@ -16,12 +16,3 @@ publisher_queue: 20 lazy: false direction: GZ_TO_ROS - -- ros_topic_name: "clock" - gz_topic_name: "clock" - ros_type_name: "rosgraph_msgs/msg/Clock" - gz_type_name: "gz.msgs.Clock" - subscriber_queue: 10 - publisher_queue: 20 - lazy: false - direction: GZ_TO_ROS