Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr/add topicname args to navigation launch melodic #136

Merged
merged 4 commits into from
Apr 5, 2020
Merged

Pr/add topicname args to navigation launch melodic #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08d70ac
add topic args to navigation launch files
sktometometo Feb 11, 2020
5b6aae8
fixed map_topic bugs
sktometometo Feb 11, 2020
d08fe71
fixed scan_topic bug
sktometometo Feb 21, 2020
fee4bd4
remove tabs
sktometometo Feb 22, 2020
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
14 changes: 13 additions & 1 deletion fetch_navigation/launch/fetch_nav.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<arg name="move_base_include" default="$(find fetch_navigation)/launch/include/move_base.launch.xml" />
<arg name="amcl_include" default="$(find fetch_navigation)/launch/include/amcl.launch.xml" />

<!-- set topics -->
<arg name="scan_topic" default="base_scan" />
<arg name="map_topic" default="map" />
<arg name="cmd_vel_topic" default="cmd_vel" />
<arg name="odom_topic" default="odom" />

<!-- serve up a map -->
<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" />

Expand All @@ -23,12 +29,18 @@
</group>

<!-- localize the robot -->
<include file="$(arg amcl_include)" />
<include file="$(arg amcl_include)" >
<arg name="scan_topic" value="$(arg scan_topic)" />
<arg name="map_topic" value="$(arg map_topic)" />
</include>

<!-- move the robot -->
<include file="$(arg move_base_include)" >
<arg name="name" value="fetch" />
<arg if="$(arg use_keepout)" name="map_topic" value="map_keepout" />
<arg unless="$(arg use_keepout)" name="map_topic" value="$(arg map_topic)" />
<arg name="cmd_vel_topic" value="$(arg cmd_vel_topic)" />
<arg name="odom_topic" value="$(arg odom_topic)" />
</include>

<!-- tilt the head -->
Expand Down
14 changes: 13 additions & 1 deletion fetch_navigation/launch/freight_nav.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<arg name="move_base_include" default="$(find fetch_navigation)/launch/include/move_base.launch.xml" />
<arg name="amcl_include" default="$(find fetch_navigation)/launch/include/amcl.launch.xml" />

<!-- set topics -->
<arg name="scan_topic" default="base_scan" />
<arg name="map_topic" default="map" />
<arg name="cmd_vel_topic" default="cmd_vel" />
<arg name="odom_topic" default="odom" />

<!-- serve up a map -->
<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" />

Expand All @@ -23,12 +29,18 @@
</group>

<!-- localize the robot -->
<include file="$(arg amcl_include)" />
<include file="$(arg amcl_include)" >
<arg name="scan_topic" value="$(arg scan_topic)" />
<arg name="map_topic" value="$(arg map_topic)" />
</include>

<!-- move the robot -->
<include file="$(arg move_base_include)" >
<arg name="name" value="freight" />
<arg if="$(arg use_keepout)" name="map_topic" value="map_keepout" />
<arg unless="$(arg use_keepout)" name="map_topic" value="$(arg map_topic)" />
<arg name="cmd_vel_topic" value="$(arg cmd_vel_topic)" />
<arg name="odom_topic" value="$(arg odom_topic)" />
</include>

</launch>