From a60a81d6bb4abd49e9c833c24f48392e587706fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Wed, 6 Nov 2024 19:47:11 +0100 Subject: [PATCH 1/2] Refactor navsat 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/navsat.yaml | 9 ++++ ros_gz_sim_demos/launch/navsat.launch.py | 63 ----------------------- ros_gz_sim_demos/launch/navsat.launch.xml | 6 +++ 5 files changed, 22 insertions(+), 64 deletions(-) create mode 100644 ros_gz_sim_demos/config/navsat.yaml delete mode 100644 ros_gz_sim_demos/launch/navsat.launch.py create mode 100644 ros_gz_sim_demos/launch/navsat.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..e1c32771 100644 --- a/ros_gz_sim_demos/README.md +++ b/ros_gz_sim_demos/README.md @@ -134,7 +134,7 @@ Publishes magnetic field readings. Publishes satellite navigation readings, only available in Fortress on. - ros2 launch ros_gz_sim_demos navsat.launch.py + ros2 launch ros_gz_sim_demos navsat.launch.xml ![](images/navsat_demo.png) diff --git a/ros_gz_sim_demos/config/navsat.yaml b/ros_gz_sim_demos/config/navsat.yaml new file mode 100644 index 00000000..b50f7ecc --- /dev/null +++ b/ros_gz_sim_demos/config/navsat.yaml @@ -0,0 +1,9 @@ +# Navsat configuration. +- ros_topic_name: "/navsat" + gz_topic_name: "/navsat" + ros_type_name: "sensor_msgs/msg/NavSatFix" + gz_type_name: "gz.msgs.NavSat" + subscriber_queue: 5 + publisher_queue: 6 + lazy: false + direction: GZ_TO_ROS diff --git a/ros_gz_sim_demos/launch/navsat.launch.py b/ros_gz_sim_demos/launch/navsat.launch.py deleted file mode 100644 index f2172f93..00000000 --- a/ros_gz_sim_demos/launch/navsat.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 = 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': '-v 4 -r spherical_coordinates.sdf' - }.items(), - ) - - # RQt - rqt = Node( - package='rqt_topic', - executable='rqt_topic', - arguments=['-t'], - condition=IfCondition(LaunchConfiguration('rqt')) - ) - - # Bridge - bridge = Node( - package='ros_gz_bridge', - executable='parameter_bridge', - arguments=['/navsat@sensor_msgs/msg/NavSatFix@gz.msgs.NavSat'], - output='screen' - ) - - return LaunchDescription([ - gz_sim, - DeclareLaunchArgument('rqt', default_value='true', - description='Open RQt.'), - bridge, - rqt - ]) diff --git a/ros_gz_sim_demos/launch/navsat.launch.xml b/ros_gz_sim_demos/launch/navsat.launch.xml new file mode 100644 index 00000000..57662851 --- /dev/null +++ b/ros_gz_sim_demos/launch/navsat.launch.xml @@ -0,0 +1,6 @@ + + + + + + From 0d01a362454ffa70c982a7674574ef98f3f471ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Fri, 22 Nov 2024 18:21:50 +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/navsat.yaml | 7 ++----- ros_gz_sim_demos/launch/navsat.launch.xml | 10 ++++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ros_gz_sim_demos/config/navsat.yaml b/ros_gz_sim_demos/config/navsat.yaml index b50f7ecc..0a68ab80 100644 --- a/ros_gz_sim_demos/config/navsat.yaml +++ b/ros_gz_sim_demos/config/navsat.yaml @@ -1,9 +1,6 @@ # Navsat configuration. -- ros_topic_name: "/navsat" - gz_topic_name: "/navsat" +- topic_name: "/navsat" ros_type_name: "sensor_msgs/msg/NavSatFix" gz_type_name: "gz.msgs.NavSat" - subscriber_queue: 5 - publisher_queue: 6 - lazy: false + lazy: true direction: GZ_TO_ROS diff --git a/ros_gz_sim_demos/launch/navsat.launch.xml b/ros_gz_sim_demos/launch/navsat.launch.xml index 57662851..97ad0adc 100644 --- a/ros_gz_sim_demos/launch/navsat.launch.xml +++ b/ros_gz_sim_demos/launch/navsat.launch.xml @@ -1,6 +1,12 @@ - - + +