Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions fetch_gazebo/launch/include/fetch.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<arg name="y" default="0.0" />
<arg name="z" default="0.0" />
<arg name="yaw" default="0.0" />
<arg name="launch_teleop" default="true" />
<arg name="joy_device" default="/dev/fetch_joy" />
<arg name="ps4" default="false" />

<!-- Setup controllers -->
<rosparam file="$(find fetch_gazebo)/config/default_controllers.yaml" command="load" />
Expand Down Expand Up @@ -31,9 +34,11 @@
<param name="lazy" type="bool" value="True"/>
</node>

<!-- Start a mux between application and teleop -->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not particularly familiar with the use of mux'ing different command inputs; can you describe why this block is/should be removed? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your review and sorry for my lack of explanation.

This mux node is actually not removed. This is included in teleop.launch.xml.
https://github.com/fetchrobotics/fetch_robots/blob/5fd6302bd17175c11d0ddfb4171f8513bc82a5b5/fetch_bringup/launch/include/teleop.launch.xml#L27-L29

<node pkg="topic_tools" type="mux" name="cmd_vel_mux" respawn="true" args="base_controller/command /cmd_vel /teleop/cmd_vel">
<remap from="mux" to="cmd_vel_mux" />
</node>
<!-- Teleop -->
<include if="$(arg launch_teleop)" file="$(find fetch_bringup)/launch/include/teleop.launch.xml">
<arg name="joy_device" value="$(arg joy_device)"/>
<arg name="ps4" value="$(arg ps4)"/>
</include>
<param name="joy/deadzone" value="0.05"/>

</launch>
9 changes: 8 additions & 1 deletion fetch_gazebo/launch/playground.launch
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<arg name="debug" default="false"/>
<arg name="gui" default="true"/>
<arg name="headless" default="false"/>
<arg name="launch_teleop" default="true"/>
<arg name="joy_device" default="/dev/fetch_joy"/>
<arg name="ps4" default="false"/>

<!-- Start Gazebo with a blank world -->
<include file="$(find gazebo_ros)/launch/empty_world.launch">
Expand All @@ -18,6 +21,10 @@
</include>

<!-- Oh, you wanted a robot? -->
<include file="$(find fetch_gazebo)/launch/include/$(arg robot).launch.xml" />
<include file="$(find fetch_gazebo)/launch/include/$(arg robot).launch.xml">
<arg name="launch_teleop" value="$(arg launch_teleop)"/>
<arg name="joy_device" value="$(arg joy_device)"/>
<arg name="ps4" value="$(arg ps4)"/>
</include>

</launch>