@@ -49,22 +49,15 @@ def generate_launch_description():
4949
5050def launch_setup (context : LaunchContext ) -> list [IncludeLaunchDescription ]:
5151
52+ # tf_prefix is implicitly used in robot_state_publisher (in URDF substitution)
5253 tf_prefix = LaunchConfiguration ("tf_prefix" , default = "" )
5354
54- robot_state_pub_node = prepare_robot_state_publisher_node ()
55- control_node = preapre_control_node ()
56- rviz_node = prepare_rviz_node (enable = LaunchConfiguration ("launch_rviz" ))
57-
58- joint_state_broadcaster_spawner = prepare_controller_spawner ("joint_state_broadcaster" )
59-
60- gripper_controller_spawner = prepare_controller_spawner ("gripper_action_controller" )
61-
6255 return [
63- control_node ,
64- robot_state_pub_node ,
65- rviz_node ,
66- joint_state_broadcaster_spawner ,
67- gripper_controller_spawner ,
56+ preapre_control_node () ,
57+ prepare_robot_state_publisher_node () ,
58+ prepare_rviz_node ( enable = LaunchConfiguration ( "launch_rviz" )) ,
59+ prepare_controller_spawner ( "joint_state_broadcaster" ) ,
60+ prepare_controller_spawner ( "gripper_action_controller" ) ,
6861 ]
6962
7063
@@ -86,14 +79,15 @@ def prepare_rviz_node(enable: LaunchConfiguration):
8679 condition = IfCondition (enable ),
8780 )
8881
82+
8983def preapre_control_node () -> Node :
9084 robot_controllers = ParameterFile (
9185 PathJoinSubstitution (
9286 [
9387 FindPackageShare ("robotiq_hande_driver" ),
94- "bringup" ,
95- "config" ,
96- "hande_controller.yaml" ,
88+ "bringup" ,
89+ "config" ,
90+ "hande_controller.yaml" ,
9791 ]
9892 ),
9993 allow_substs = True ,
0 commit comments