Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_rosnav
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
ros
navigation
iri_rosnav
Commits
26f7df45
Commit
26f7df45
authored
4 years ago
by
Fernando Herrero
Browse files
Options
Downloads
Patches
Plain Diff
Add argument to choose map path
parent
a30ced00
No related branches found
No related tags found
1 merge request
!1
Melodic migration
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
launch/include/map_server.launch
+2
-1
2 additions, 1 deletion
launch/include/map_server.launch
launch/nav.launch
+2
-0
2 additions, 0 deletions
launch/nav.launch
with
4 additions
and
1 deletion
launch/include/map_server.launch
+
2
−
1
View file @
26f7df45
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<launch>
<launch>
<arg
name=
"ns"
default=
"robot"
/>
<arg
name=
"ns"
default=
"robot"
/>
<arg
name=
"map_path"
default=
"$(find iri_maps)/maps"
/>
<arg
name=
"map_name"
default=
"empty"
/>
<arg
name=
"map_name"
default=
"empty"
/>
<arg
name=
"map_frame_id"
default=
"map"
/>
<arg
name=
"map_frame_id"
default=
"map"
/>
<arg
name=
"map_topic"
default=
"$(arg ns)/map"
/>
<arg
name=
"map_topic"
default=
"$(arg ns)/map"
/>
...
@@ -15,7 +16,7 @@
...
@@ -15,7 +16,7 @@
<node
name=
"map_server"
<node
name=
"map_server"
pkg =
"map_server"
pkg =
"map_server"
type=
"map_server"
type=
"map_server"
args=
"$(
find iri_maps)/maps
/$(arg map_name).yaml"
args=
"$(
arg map_path)
/$(arg map_name).yaml"
output=
"$(arg output)"
output=
"$(arg output)"
launch-prefix=
"$(arg launch_prefix)"
>
launch-prefix=
"$(arg launch_prefix)"
>
<param
name=
"frame_id"
value=
"$(arg map_frame_id)"
/>
<param
name=
"frame_id"
value=
"$(arg map_frame_id)"
/>
...
...
This diff is collapsed.
Click to expand it.
launch/nav.launch
+
2
−
0
View file @
26f7df45
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
<arg
name=
"scan_topic"
default=
"/$(arg ns)/sensors/scan"
/>
<arg
name=
"scan_topic"
default=
"/$(arg ns)/sensors/scan"
/>
<arg
name=
"use_map"
default=
"true"
/>
<arg
name=
"use_map"
default=
"true"
/>
<arg
name=
"use_map_server"
default=
"true"
/>
<arg
name=
"use_map_server"
default=
"true"
/>
<arg
name=
"map_path"
default=
"$(find iri_maps)/map"
/>
<arg
name=
"map_name"
default=
"willow"
/>
<arg
name=
"map_name"
default=
"willow"
/>
<arg
name=
"use_amcl"
default=
"true"
/>
<arg
name=
"use_amcl"
default=
"true"
/>
<arg
name=
"amcl_config"
default=
"$(arg path)/amcl.yaml"
/>
<arg
name=
"amcl_config"
default=
"$(arg path)/amcl.yaml"
/>
...
@@ -39,6 +40,7 @@
...
@@ -39,6 +40,7 @@
<include
file=
"$(find iri_rosnav)/launch/include/map_server.launch"
>
<include
file=
"$(find iri_rosnav)/launch/include/map_server.launch"
>
<arg
name=
"ns"
value=
"$(arg ns)"
/>
<arg
name=
"ns"
value=
"$(arg ns)"
/>
<arg
name=
"map_frame_id"
value=
"$(arg map_frame_id)"
/>
<arg
name=
"map_frame_id"
value=
"$(arg map_frame_id)"
/>
<arg
name=
"map_path"
value=
"$(arg map_path)"
/>
<arg
name=
"map_name"
value=
"$(arg map_name)"
/>
<arg
name=
"map_name"
value=
"$(arg map_name)"
/>
<arg
name=
"map_topic"
value=
"$(arg map_topic)"
/>
<arg
name=
"map_topic"
value=
"$(arg map_topic)"
/>
<arg
name=
"map_service"
value=
"$(arg map_service)"
/>
<arg
name=
"map_service"
value=
"$(arg map_service)"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment