diff --git a/agv_pro_description/launch/agv_pro_display.launch.py b/agv_pro_description/launch/agv_pro_display.launch.py index 9218e09..7e6ff4e 100644 --- a/agv_pro_description/launch/agv_pro_display.launch.py +++ b/agv_pro_description/launch/agv_pro_display.launch.py @@ -1,12 +1,15 @@ import os from launch import LaunchDescription -from launch_ros.actions import Node +from launch_ros.actions import Node,PushRosNamespace from launch.conditions import IfCondition -from launch.substitutions import LaunchConfiguration +from launch.actions import DeclareLaunchArgument +from launch.substitutions import Command,LaunchConfiguration,PythonExpression from ament_index_python.packages import get_package_share_directory def generate_launch_description(): + namespace = LaunchConfiguration('namespace', default='') + use_rviz = LaunchConfiguration('use_rviz', default='true') rviz_config_dir = os.path.join( @@ -20,11 +23,22 @@ def generate_launch_description(): 'agv_pro.urdf' ) - with open(urdf_file, 'r') as file: - robot_description_content = file.read() + robot_description_content = Command([ + 'xacro ', + urdf_file, + ' namespace:=', + PythonExpression(['"', namespace, '" + "/" if "', namespace, '" != "" else ""']), + ]) return LaunchDescription([ + DeclareLaunchArgument( + 'namespace', + default_value='', + description='Namespace for nodes'), + + PushRosNamespace(namespace), + Node( package='joint_state_publisher', executable='joint_state_publisher', diff --git a/agv_pro_description/package.xml b/agv_pro_description/package.xml index 4bd928b..bc8dd36 100755 --- a/agv_pro_description/package.xml +++ b/agv_pro_description/package.xml @@ -2,7 +2,7 @@ agv_pro_description - 1.0.0 + 1.0.1

URDF Description package for AGV pro