Skip to content

Commit f03dd5c

Browse files
committed
[fetch_gazebo] Add option to launch teleop node
1 parent 93d3686 commit f03dd5c

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

fetch_gazebo/launch/include/fetch.launch.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
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" />
@@ -31,9 +34,11 @@
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>

fetch_gazebo/launch/playground.launch

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
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">
@@ -18,6 +21,10 @@
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>

0 commit comments

Comments
 (0)