From 3830546f0013ca91801531160b54fa430d6b5857 Mon Sep 17 00:00:00 2001 From: rafal-gorecki Date: Thu, 19 Oct 2023 14:20:02 +0200 Subject: [PATCH] choices to root dir --- rosbot_xl_bringup/launch/bringup.launch.py | 6 ++--- .../launch/controller.launch.py | 23 ++++++++++++++++--- rosbot_xl_gazebo/launch/simulation.launch.py | 21 ++--------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/rosbot_xl_bringup/launch/bringup.launch.py b/rosbot_xl_bringup/launch/bringup.launch.py index 90c46334..5cf27d7b 100644 --- a/rosbot_xl_bringup/launch/bringup.launch.py +++ b/rosbot_xl_bringup/launch/bringup.launch.py @@ -25,14 +25,14 @@ def generate_launch_description(): declare_lidar_model_arg = DeclareLaunchArgument( "lidar_model", default_value="slamtec_rplidar_s1", - description="Lidar model added to the URDF", + description="Add LiDAR model to the robot URDF", ) camera_model = LaunchConfiguration("camera_model") declare_camera_model_arg = DeclareLaunchArgument( "camera_model", default_value="None", - description="Camera model added to the URDF", + description="Add camera model to the robot URDF", ) include_camera_mount = LaunchConfiguration("include_camera_mount") @@ -115,4 +115,4 @@ def generate_launch_description(): laser_filter_node, ] - return LaunchDescription(actions) \ No newline at end of file + return LaunchDescription(actions) diff --git a/rosbot_xl_controller/launch/controller.launch.py b/rosbot_xl_controller/launch/controller.launch.py index 80b87970..47d5a663 100644 --- a/rosbot_xl_controller/launch/controller.launch.py +++ b/rosbot_xl_controller/launch/controller.launch.py @@ -43,14 +43,31 @@ def generate_launch_description(): declare_lidar_model_arg = DeclareLaunchArgument( "lidar_model", default_value="slamtec_rplidar_s1", - description="Lidar model added to the URDF", + description="Add LiDAR model to the robot URDF", + choices=[ + "None", + "slamtec_rplidar_s1", + "slamtec_rplidar_a2", + "slamtec_rplidar_a3", + "velodyne_puck", + ], ) camera_model = LaunchConfiguration("camera_model") declare_camera_model_arg = DeclareLaunchArgument( "camera_model", default_value="None", - description="Camera model added to the URDF", + description="Add camera model to the robot URDF", + choices=[ + "None", + "intel_realsense_d435", + "stereolabs_zed", + "stereolabs_zedm", + "stereolabs_zed2", + "stereolabs_zed2i", + "stereolabs_zedx", + "stereolabs_zedxm", + ], ) include_camera_mount = LaunchConfiguration("include_camera_mount") @@ -218,4 +235,4 @@ def generate_launch_description(): delay_imu_broadcaster_spawner_after_robot_controller_spawner, ] - return LaunchDescription(actions) \ No newline at end of file + return LaunchDescription(actions) diff --git a/rosbot_xl_gazebo/launch/simulation.launch.py b/rosbot_xl_gazebo/launch/simulation.launch.py index 21199918..e75fa9f4 100644 --- a/rosbot_xl_gazebo/launch/simulation.launch.py +++ b/rosbot_xl_gazebo/launch/simulation.launch.py @@ -28,31 +28,14 @@ def generate_launch_description(): declare_lidar_model_arg = DeclareLaunchArgument( "lidar_model", default_value="slamtec_rplidar_s1", - description=f"Add LiDAR model to the robot URDF", - choices=[ - "None", - "slamtec_rplidar_s1", - "slamtec_rplidar_a2", - "slamtec_rplidar_a3", - "velodyne_puck", - ], + description="Add LiDAR model to the robot URDF", ) camera_model = LaunchConfiguration("camera_model") declare_camera_model_arg = DeclareLaunchArgument( "camera_model", default_value="intel_realsense_d435", - description=f"Add camera model to the robot URDF model", - choices=[ - "None", - "intel_realsense_d435", - "stereolabs_zed", - "stereolabs_zedm", - "stereolabs_zed2", - "stereolabs_zed2i", - "stereolabs_zedx", - "stereolabs_zedxm", - ], + description="Add camera model to the robot URDF model", ) include_camera_mount = LaunchConfiguration("include_camera_mount")