File tree Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Original file line number Diff line number Diff line change 44 <arg name =" y" default =" 0.0" />
55 <arg name =" z" default =" 0.0" />
66 <arg name =" yaw" default =" 0.0" />
7+ <arg name =" launch_teleop" default =" true" />
8+ <arg name =" joy_device" default =" /dev/fetch_joy" />
9+ <arg name =" ps4" default =" false" />
710
811 <!-- Setup controllers -->
912 <rosparam file =" $(find fetch_gazebo)/config/default_controllers.yaml" command =" load" />
3134 <param name =" lazy" type =" bool" value =" True" />
3235 </node >
3336
34- <!-- Start a mux between application and teleop -->
35- <node pkg =" topic_tools" type =" mux" name =" cmd_vel_mux" respawn =" true" args =" base_controller/command /cmd_vel /teleop/cmd_vel" >
36- <remap from =" mux" to =" cmd_vel_mux" />
37- </node >
37+ <!-- Teleop -->
38+ <include if =" $(arg launch_teleop)" file =" $(find fetch_bringup)/launch/include/teleop.launch.xml" >
39+ <arg name =" joy_device" value =" $(arg joy_device)" />
40+ <arg name =" ps4" value =" $(arg ps4)" />
41+ </include >
42+ <param name =" joy/deadzone" value =" 0.05" />
3843
3944</launch >
Original file line number Diff line number Diff line change 66 <arg name =" debug" default =" false" />
77 <arg name =" gui" default =" true" />
88 <arg name =" headless" default =" false" />
9+ <arg name =" launch_teleop" default =" true" />
10+ <arg name =" joy_device" default =" /dev/fetch_joy" />
11+ <arg name =" ps4" default =" false" />
912
1013 <!-- Start Gazebo with a blank world -->
1114 <include file =" $(find gazebo_ros)/launch/empty_world.launch" >
1821 </include >
1922
2023 <!-- Oh, you wanted a robot? -->
21- <include file =" $(find fetch_gazebo)/launch/include/$(arg robot).launch.xml" />
24+ <include file =" $(find fetch_gazebo)/launch/include/$(arg robot).launch.xml" >
25+ <arg name =" launch_teleop" value =" $(arg launch_teleop)" />
26+ <arg name =" joy_device" value =" $(arg joy_device)" />
27+ <arg name =" ps4" value =" $(arg ps4)" />
28+ </include >
2229
2330</launch >
You can’t perform that action at this time.
0 commit comments