From 9be02175d2baa82109c04c413fdb5d8c02d694f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Tue, 5 Nov 2024 21:36:49 +0100 Subject: [PATCH 1/2] Refactor camera demo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_sim_demos/CMakeLists.txt | 6 +++ ros_gz_sim_demos/README.md | 2 +- ros_gz_sim_demos/config/camera.yaml | 18 +++++++ ros_gz_sim_demos/launch/camera.launch.py | 63 ----------------------- ros_gz_sim_demos/launch/camera.launch.xml | 6 +++ 5 files changed, 31 insertions(+), 64 deletions(-) create mode 100644 ros_gz_sim_demos/config/camera.yaml delete mode 100644 ros_gz_sim_demos/launch/camera.launch.py create mode 100644 ros_gz_sim_demos/launch/camera.launch.xml diff --git a/ros_gz_sim_demos/CMakeLists.txt b/ros_gz_sim_demos/CMakeLists.txt index 8e0f580a..9b69104b 100644 --- a/ros_gz_sim_demos/CMakeLists.txt +++ b/ros_gz_sim_demos/CMakeLists.txt @@ -9,6 +9,12 @@ if(BUILD_TESTING) ament_lint_auto_find_test_dependencies() endif() +install( + DIRECTORY + config/ + DESTINATION share/${PROJECT_NAME}/config +) + install( DIRECTORY launch/ diff --git a/ros_gz_sim_demos/README.md b/ros_gz_sim_demos/README.md index c404a4dc..bbe18a15 100644 --- a/ros_gz_sim_demos/README.md +++ b/ros_gz_sim_demos/README.md @@ -40,7 +40,7 @@ Using the image bridge (unidirectional, uses [image_transport](http://wiki.ros.o Using the regular bridge: - ros2 launch ros_gz_sim_demos camera.launch.py + ros2 launch ros_gz_sim_demos camera.launch.xml To use a camera that only publishes information when triggered: diff --git a/ros_gz_sim_demos/config/camera.yaml b/ros_gz_sim_demos/config/camera.yaml new file mode 100644 index 00000000..15681dc3 --- /dev/null +++ b/ros_gz_sim_demos/config/camera.yaml @@ -0,0 +1,18 @@ +# Camera bridge configuration. +- ros_topic_name: "/camera" + gz_topic_name: "/camera" + ros_type_name: "sensor_msgs/msg/Image" + gz_type_name: "gz.msgs.Image" + subscriber_queue: 5 + publisher_queue: 6 + lazy: false + direction: GZ_TO_ROS + +- ros_topic_name: "/camera_info" + gz_topic_name: "/camera_info" + ros_type_name: "sensor_msgs/msg/CameraInfo" + gz_type_name: "gz.msgs.CameraInfo" + subscriber_queue: 5 + publisher_queue: 6 + lazy: false + direction: GZ_TO_ROS diff --git a/ros_gz_sim_demos/launch/camera.launch.py b/ros_gz_sim_demos/launch/camera.launch.py deleted file mode 100644 index aaa5fc49..00000000 --- a/ros_gz_sim_demos/launch/camera.launch.py +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2019 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os - -from ament_index_python.packages import get_package_share_directory - -from launch import LaunchDescription -from launch.actions import DeclareLaunchArgument -from launch.actions import IncludeLaunchDescription -from launch.conditions import IfCondition -from launch.launch_description_sources import PythonLaunchDescriptionSource -from launch.substitutions import LaunchConfiguration - -from launch_ros.actions import Node - - -def generate_launch_description(): - - pkg_ros_gz_sim_demos = get_package_share_directory('ros_gz_sim_demos') - pkg_ros_gz_sim = get_package_share_directory('ros_gz_sim') - - gz_sim = IncludeLaunchDescription( - PythonLaunchDescriptionSource( - os.path.join(pkg_ros_gz_sim, 'launch', 'gz_sim.launch.py')), - launch_arguments={'gz_args': '-r camera_sensor.sdf'}.items(), - ) - - # RViz - rviz = Node( - package='rviz2', - executable='rviz2', - arguments=['-d', os.path.join(pkg_ros_gz_sim_demos, 'rviz', 'camera.rviz')], - condition=IfCondition(LaunchConfiguration('rviz')) - ) - - # Bridge - bridge = Node( - package='ros_gz_bridge', - executable='parameter_bridge', - arguments=['/camera@sensor_msgs/msg/Image@gz.msgs.Image', - '/camera_info@sensor_msgs/msg/CameraInfo@gz.msgs.CameraInfo'], - output='screen' - ) - - return LaunchDescription([ - DeclareLaunchArgument('rviz', default_value='true', - description='Open RViz.'), - gz_sim, - bridge, - rviz - ]) diff --git a/ros_gz_sim_demos/launch/camera.launch.xml b/ros_gz_sim_demos/launch/camera.launch.xml new file mode 100644 index 00000000..4b2efc80 --- /dev/null +++ b/ros_gz_sim_demos/launch/camera.launch.xml @@ -0,0 +1,6 @@ + + + + + + From e381f14be0782f2fa66b0fd2a1058a234559710d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Fri, 22 Nov 2024 17:57:20 +0100 Subject: [PATCH 2/2] Tweak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- ros_gz_sim_demos/config/camera.yaml | 14 ++++---------- ros_gz_sim_demos/launch/camera.launch.xml | 10 ++++++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ros_gz_sim_demos/config/camera.yaml b/ros_gz_sim_demos/config/camera.yaml index 15681dc3..17fa88f9 100644 --- a/ros_gz_sim_demos/config/camera.yaml +++ b/ros_gz_sim_demos/config/camera.yaml @@ -1,18 +1,12 @@ # Camera bridge configuration. -- ros_topic_name: "/camera" - gz_topic_name: "/camera" +- topic_name: "/camera" ros_type_name: "sensor_msgs/msg/Image" gz_type_name: "gz.msgs.Image" - subscriber_queue: 5 - publisher_queue: 6 - lazy: false + lazy: true direction: GZ_TO_ROS -- ros_topic_name: "/camera_info" - gz_topic_name: "/camera_info" +- topic_name: "/camera_info" ros_type_name: "sensor_msgs/msg/CameraInfo" gz_type_name: "gz.msgs.CameraInfo" - subscriber_queue: 5 - publisher_queue: 6 - lazy: false + lazy: true direction: GZ_TO_ROS diff --git a/ros_gz_sim_demos/launch/camera.launch.xml b/ros_gz_sim_demos/launch/camera.launch.xml index 4b2efc80..1ad7a2d3 100644 --- a/ros_gz_sim_demos/launch/camera.launch.xml +++ b/ros_gz_sim_demos/launch/camera.launch.xml @@ -1,6 +1,12 @@ - - + +