|
24 | 24 | from launch.actions import IncludeLaunchDescription |
25 | 25 | from launch.launch_description_sources import PythonLaunchDescriptionSource |
26 | 26 | from launch.substitutions import LaunchConfiguration |
27 | | -from launch.substitutions import PythonExpression |
28 | 27 | from launch.substitutions import ThisLaunchFileDir |
29 | 28 | from launch_ros.actions import Node |
30 | 29 | from launch_ros.actions import PushRosNamespace |
@@ -104,17 +103,17 @@ def generate_launch_description(): |
104 | 103 |
|
105 | 104 | IncludeLaunchDescription( |
106 | 105 | PythonLaunchDescriptionSource([lidar_pkg_dir, LDS_LAUNCH_FILE]), |
107 | | - launch_arguments={'port': '/dev/ttyUSB0', 'frame_id': 'base_scan'}.items(), |
| 106 | + launch_arguments={'port': '/dev/ttyUSB0', |
| 107 | + 'frame_id': 'base_scan', |
| 108 | + 'namespace': namespace}.items(), |
108 | 109 | ), |
109 | 110 |
|
110 | 111 | Node( |
111 | 112 | package='turtlebot3_node', |
112 | 113 | executable='turtlebot3_ros', |
113 | 114 | parameters=[ |
114 | 115 | tb3_param_dir, |
115 | | - {'odometry.frame_id': PythonExpression(['"', namespace, '/odom"'])}, |
116 | | - {'odometry.child_frame_id': PythonExpression( |
117 | | - ['"', namespace, '/base_footprint"'])}], |
| 116 | + {'namespace': namespace}], |
118 | 117 | arguments=['-i', usb_port], |
119 | 118 | output='screen'), |
120 | 119 | ]) |
0 commit comments