Skip to content

Commit

Permalink
updated ros 2d nav stack example mission file
Browse files Browse the repository at this point in the history
  • Loading branch information
SyllogismRXS committed Aug 22, 2018
1 parent c9eb7c9 commit e156c9c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ You will need to build the SCRIMMAGE simulator

$ cd ~/catkin_ws
$ catkin_make

## Install ROS 2D Navigation Stack Dependencies

$ sudo apt-get install ros-kinetic-nav2d ros-kinetic-rviz \
ros-kinetic-map-server ros-kinetic-move-base ros-kinetic-global-planner

## Run Example

The example SCRIMMAGE mission / roslaunch simulates two ground robots running
Expand Down Expand Up @@ -55,7 +60,7 @@ may be automated in the future, but it's manual configuration for now.

You need to specify the same map file in both multiple-robots.launch
(name="map\_name" default="simple-maze-1") and the ros-ex1.xml scrimmage
mission file (e.g., entity_interaction order="0" map="simple-maze-1").
mission file (e.g., entity_interaction map="simple-maze-1").

### Robot Transforms

Expand Down
15 changes: 9 additions & 6 deletions missions/ros-ex1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<grid_spacing>10</grid_spacing>
<grid_size>200</grid_size>

<background_color>191 191 191</background_color> <!-- Red Green Blue -->
<gui_update_period>10</gui_update_period> <!-- milliseconds -->

Expand All @@ -31,9 +31,12 @@
<altitude_origin>300</altitude_origin>
<show_origin>true</show_origin>
<origin_length>10</origin_length>

<entity_interaction order="0" enable_collision_detection="false" show_rays="true">BulletCollision</entity_interaction>
<entity_interaction order="1" map="simple-maze-1">MapGen2D</entity_interaction>

<entity_interaction enable_collision_detection="false" show_rays="true">BulletCollision</entity_interaction>
<entity_interaction map="simple-maze-1">MapGen2D</entity_interaction>

<network>GlobalNetwork</network>
<network>LocalNetwork</network>

<!-- uncomment "seed" and use integer for deterministic results -->
<!--<seed>1714060370</seed>-->
Expand All @@ -52,7 +55,7 @@
<z>0.42</z>
<heading>0</heading>

<controller>UnicycleControllerDirect</controller>
<controller>DirectController</controller>
<motion_model>Unicycle</motion_model>
<visual_model>volkswagen</visual_model>
<autonomy>ROSAutonomy</autonomy>
Expand All @@ -72,7 +75,7 @@
<z>0.42</z>
<heading>0</heading>

<controller>UnicycleControllerDirect</controller>
<controller>DirectController</controller>
<motion_model>Unicycle</motion_model>
<visual_model>volkswagen</visual_model>
<autonomy>ROSAutonomy</autonomy>
Expand Down

0 comments on commit e156c9c

Please sign in to comment.