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.

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

Scenario gui #36

Open
wants to merge 124 commits into
base: local_planner_subgoalmode
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
943ebee
remove trailing space
dangaw255 Jan 30, 2021
bdc647d
edit README.md
dangaw255 Jan 30, 2021
0d03daa
Update Evaluations.md
TehamC Jan 31, 2021
924657c
Update Evaluations.md
TehamC Jan 31, 2021
7d72d62
Update Evaluations.md
TehamC Jan 31, 2021
32444f7
Update Evaluations.md
TehamC Jan 31, 2021
1b4acf4
Update Evaluations.md
TehamC Jan 31, 2021
26c3caa
Update Evaluations.md
TehamC Jan 31, 2021
344ba0c
Update Evaluations.md
TehamC Jan 31, 2021
4a1c146
Update Evaluations.md
TehamC Jan 31, 2021
dd7e498
Update Evaluations.md
TehamC Jan 31, 2021
44d4ad5
Update Evaluations.md
TehamC Jan 31, 2021
d69d8fa
Update Evaluations.md
TehamC Jan 31, 2021
436de04
Update Evaluations.md
TehamC Jan 31, 2021
668bb6b
Update Evaluations.md
TehamC Jan 31, 2021
df1bb70
Update Evaluations.md
TehamC Jan 31, 2021
2c2e405
Update Evaluations.md
linhdoan8 Jan 31, 2021
36a8c2e
Update .rosinstall
linhdoan8 Jan 31, 2021
40f4236
Update Installation.md
linhdoan8 Feb 5, 2021
07ac721
add dockerfile
Feb 8, 2021
540baad
Mount the files of repo instead of inside the container to avoid enla…
Feb 8, 2021
892ddf4
Update README.md
YiSunny Feb 8, 2021
3930a99
Make docker with low allowcated RAM runable and Update README.md
Feb 9, 2021
5012c82
Update README.md
Feb 9, 2021
f3a8487
Update README.md
YiSunny Feb 9, 2021
1693232
init docker branch
linhdoan8 Feb 12, 2021
2b8572e
Merge pull request #15 from Herrsun/master
linhdoan8 Feb 12, 2021
1b15e39
make training node cancable
linhdoan8 Feb 12, 2021
ad13a25
Included Dockerfile
linhdoan8 Feb 13, 2021
644f708
Update README.md
linhdoan8 Feb 13, 2021
39b9b8f
Update Installation.md
linhdoan8 Feb 14, 2021
d9622b8
Update Installation.md
linhdoan8 Feb 18, 2021
53967ad
Update .rosinstall
linhdoan8 Feb 18, 2021
9e7d127
Update README.md
linhdoan8 Feb 18, 2021
e1f8ad2
Merge branch 'master' of https://github.com/ignc-research/arena-rosnav
linhdoan8 Feb 19, 2021
ed27ec0
Update README.md
linhdoan8 Feb 19, 2021
6a012ef
new agents trained for 2 days
linhdoan8 Feb 19, 2021
fdc4e57
Merge branch 'master' of https://github.com/ignc-research/arena-rosnav
linhdoan8 Feb 19, 2021
444a902
Merge branch 'master' of https://github.com/ignc-research/arena-rosnav
linhdoan8 Feb 20, 2021
9ff0d23
added arena agent
linhdoan8 Feb 20, 2021
3f7e964
Update DRL-Training.md
linhdoan8 Feb 25, 2021
35bf751
add scenario gui
m-yordanova Mar 7, 2021
e31f8dc
added workflow diagram
linhdoan8 Mar 10, 2021
b487921
Merge pull request #26 from ignc-research/scenario_gui
linhdoan8 Mar 10, 2021
bd72880
added wp3 workflow diagram
linhdoan8 Mar 11, 2021
6fd5fdb
refined gym_env/scripts relation
MisterFawkes Mar 11, 2021
b1cc7d2
Update requirements_cadrl.txt
linhdoan8 Mar 16, 2021
18a666d
python coding issue solved
m-yordanova Mar 16, 2021
4ebe8ae
new output structure
m-yordanova Mar 17, 2021
dac5709
default obstacle type & error checks & no errors in the console
m-yordanova Mar 17, 2021
ea3c360
example scenario
m-yordanova Mar 17, 2021
9dde6e7
Merge branch 'master' of https://github.com/ignc-research/arena-rosna…
m-yordanova Mar 17, 2021
33af3a1
update README file with an overview for working on different OS
m-yordanova Mar 18, 2021
fcce855
small readme update
m-yordanova Mar 18, 2021
e6db813
new rviz file
m-yordanova Mar 18, 2021
ca68325
update diagram
TimoFiebelkorn Mar 18, 2021
4177928
save the new_scenario.json file directly to simulator_setup/scenerios
m-yordanova Mar 19, 2021
33c74c2
moving obstacles and watchers & use keyboard for changing their radiu…
m-yordanova Mar 20, 2021
d8bbeb5
add tips and brief explanations for future developers in the readme file
m-yordanova Mar 21, 2021
ea0081c
Merge branch 'master' of https://github.com/ignc-research/arena-rosna…
m-yordanova Mar 21, 2021
0cb6227
call parser.py from paint.py
m-yordanova Mar 21, 2021
ca1aa5a
more obstacle types added & type added on the map & watchers not nece…
m-yordanova Mar 23, 2021
3e0b1cf
left-right scrollable area for the obstacles & visualization of addit…
m-yordanova Mar 23, 2021
334e9b7
Update README.md
linhdoan8 Mar 23, 2021
dfc488c
Update README.md
linhdoan8 Mar 23, 2021
85e21f5
editable parameters depending on used obstacle types & new parameters…
m-yordanova Mar 24, 2021
7c31ae9
Merge branch 'master' of https://github.com/ignc-research/arena-rosna…
m-yordanova Mar 24, 2021
d4d2782
small bug with the scrolling area fixed & numbers in json
m-yordanova Mar 24, 2021
b2bf3fe
Readme file updated how to insert parameters
m-yordanova Mar 24, 2021
5f5467e
multiple waypoints per obstacle enabled
m-yordanova Mar 25, 2021
8d38378
add example screenshots and videos
m-yordanova Mar 26, 2021
b2cc662
small restructure
m-yordanova Mar 26, 2021
2c833ca
requirements_cadrl.txt fixed
Ducanor Mar 26, 2021
23c1df3
requirements_cadrl.txt pillow version corrected 8.1.0 to 7.2.0.
Ducanor Mar 26, 2021
7e870e9
Update Installation.md
Ducanor Mar 26, 2021
69388f5
Update Installation.md
Ducanor Mar 26, 2021
3e9a364
Update Installation.md
Ducanor Mar 26, 2021
40c616d
Update Installation.md
Ducanor Mar 26, 2021
00615d8
jump from textinput to another with tab and shift+tab & scrollview sc…
m-yordanova Mar 27, 2021
7be2801
update README.md
m-yordanova Mar 27, 2021
6d73eb4
Update README.md
linhdoan8 Mar 29, 2021
c553df1
Update README.md
linhdoan8 Mar 29, 2021
c66145f
tutorial video
m-yordanova Mar 30, 2021
3c77d05
Merge branch 'master' of https://github.com/ignc-research/arena-rosna…
m-yordanova Mar 30, 2021
8079912
Update README.md
linhdoan8 Apr 4, 2021
91a5bc7
Update README.md
linhdoan8 Apr 4, 2021
e8fe685
more maps added and tested
m-yordanova Apr 6, 2021
be05c82
Merge branch 'master' of https://github.com/ignc-research/arena-rosna…
m-yordanova Apr 6, 2021
8d1bb7c
simulation of the robot movement with a real velocity for checking wh…
m-yordanova Apr 10, 2021
3795d6b
additional video 1 to the tutorial
m-yordanova Apr 10, 2021
942d565
add eval scenarios
m-yordanova Apr 11, 2021
bd59a08
more eval scenarios
m-yordanova Apr 11, 2021
aac8541
draw waypoints before watchers & more eval scenarios
m-yordanova Apr 12, 2021
9988897
not a must to draw waypoints
m-yordanova Apr 12, 2021
93f2c09
add new map & allow 0 obstacles in the scenario
m-yordanova Apr 13, 2021
0d6b6a1
more global variables added for faster scenario making of multiple sc…
m-yordanova Apr 14, 2021
1f340c1
100 eval scenarios for map_empty_small added
m-yordanova Apr 14, 2021
af323d8
small restructure and renaming
m-yordanova Apr 14, 2021
bed469e
add a cheat sheet
m-yordanova Apr 14, 2021
6322bc7
second additional tutorial added
m-yordanova Apr 14, 2021
4568ec6
one big merged json file with all 100 scenarios
m-yordanova Apr 14, 2021
642876a
eval2 renamed
m-yordanova Apr 18, 2021
7c926f6
demo from the final presentation
m-yordanova May 2, 2021
bdbc30d
include gifs to README file
m-yordanova May 2, 2021
d501fc6
update README.md
m-yordanova May 2, 2021
3dfcb26
add example scenario to the README file
m-yordanova May 2, 2021
279884e
update README.md
m-yordanova May 2, 2021
a7df3b9
update README.md
m-yordanova May 2, 2021
900f905
update README.md
m-yordanova May 2, 2021
ec63b8c
update README.md
m-yordanova May 2, 2021
3290757
update README.md
m-yordanova May 2, 2021
32bbad2
update README.md
m-yordanova May 2, 2021
720f445
update README.md file
m-yordanova May 3, 2021
bea27b2
update README.md file
m-yordanova May 3, 2021
b10ca04
update README.md file
m-yordanova May 3, 2021
2f899d6
add scenario gui
m-yordanova May 3, 2021
2683130
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
d3c2e50
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
39d4acd
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
263dbab
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
d580b93
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
6221954
Merge branch 'local_planner_subgoalmode' of https://github.com/ignc-r…
m-yordanova May 3, 2021
4cc1dd1
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
36f5dec
try merging with local_planner_subgoalmode
m-yordanova May 3, 2021
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
12 changes: 8 additions & 4 deletions .rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
uri: https://github.com/ignc-research/stable-baselines3
version: master

- git:
local-name: ../forks/navigation/local_planner/teb
uri: https://github.com/rst-tu-dortmund/teb_local_planner
version: melodic-devel
Copy link
Collaborator

Choose a reason for hiding this comment

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

needed

#- git:
# local-name: ../forks/navigation/local_planner/teb
# uri: https://github.com/rst-tu-dortmund/teb_local_planner
# version: melodic-devel
- git:
local-name: ../forks/navigation/local_planner/mpc
uri: https://github.com/rst-tu-dortmund/mpc_local_planner
Expand All @@ -30,3 +30,7 @@
local-name: ../forks/navigation/msgs/ford
uri: https://bitbucket.org/acl-swarm/ford_msgs/src/master/
version: master
- git:
local-name: ../forks/stable-baselines3
uri: https://github.com/tuananhroman/stable-baselines3
version: master
79 changes: 79 additions & 0 deletions Docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#################################################################
# Dockerfile for Arena-Rosnav

# URL: https://github.com/ignc-research/arena-rosnav

# Based on Ubuntu 18.04 + ROS-Melodic-Desktop-Full Version

# Author: Yi Sun

#################################################################

# This image includes additional meta-packages such for desktop installations than offical image
FROM osrf/ros:melodic-desktop-full

# Change the default shell from /bin/sh to /bin/bash
SHELL ["/bin/bash","-c"]

# 1. Install additinal pkgs
RUN apt-get -y update && apt-get install -y \
libqt4-dev \
libopencv-dev \
liblua5.2-dev \
screen \
python3.6 \
python3.6-dev \
libpython3.6-dev \
python3-catkin-pkg-modules \
python3-rospkg-modules \
python3-empy \
python3-setuptools \
python3-pip \
ros-melodic-navigation \
ros-melodic-teb-local-planner \
ros-melodic-mpc-local-planner \
&& echo $'\n\
source /opt/ros/melodic/setup.sh' >> /root/.bashrc

# 2. Prepare virtual environment
RUN pip3 install --upgrade pip \
&& pip3 install virtualenv virtualenvwrapper\
&& cd /root \
&& mkdir .python_env \
&& echo $'\n\
export WORKON_HOME=/root/.python_env \n\
export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3 \n\
export VIRTUALENVWRAPPER_VIRTUALENV=/usr/local/bin/virtualenv \n\
source /usr/local/bin/virtualenvwrapper.sh' >> /root/.bashrc

ENV WORKON_HOME=/root/.python_env \
VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3 \
VIRTUALENVWRAPPER_VIRTUALENV=/usr/local/bin/virtualenv

# 3. Create python virtualenv and install dependencies
RUN . /usr/local/bin/virtualenvwrapper.sh \
&& mkvirtualenv --python=python3.6 rosnav \
&& workon rosnav \
&& pip install --extra-index-url https://rospypi.github.io/simple/ rospy rosbag tf tf2_ros --ignore-installed \
&& pip install pyyaml catkin_pkg netifaces pathlib \
&& pip --no-cache-dir install stable-baselines3

# 4. Install Arena-Rosnav repo and compile
RUN git clone --depth 1 https://github.com/ignc-research/arena-rosnav /root/catkin_ws/src/arena-rosnav \
&& . /usr/local/bin/virtualenvwrapper.sh \
&& . /opt/ros/melodic/setup.sh \
&& workon rosnav \
&& pip install -r /root/catkin_ws/src/arena-rosnav/arena_navigation/arena_local_planner/model_based/cadrl_ros/requirements_cadrl.txt \
&& pip install gym \
&& cd /root/catkin_ws/src/arena-rosnav \
&& rosws update \
&& . /opt/ros/melodic/setup.sh \
&& cd /root/catkin_ws \
&& catkin_make -DPYTHON_EXECUTABLE=/usr/bin/python3 \
&& echo $'source /root/catkin_ws/devel/setup.bash' >> /root/.bashrc

# 5. Install geometry2 pkg
RUN . /root/.bashrc \
&& . /opt/ros/melodic/setup.sh \
&& cd /root/catkin_ws/src/arena-rosnav/ \
&& . geometry2_install.sh
71 changes: 71 additions & 0 deletions Docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
## Install docker
Ubuntu:
https://cnvrg.io/how-to-setup-docker-and-nvidia-docker-2-0-on-ubuntu-18-04/

Mac:
https://docs.docker.com/docker-for-mac/install/

Windows:
https://docs.docker.com/docker-for-windows/install/

### Install docker-compose
https://docs.docker.com/compose/install/

## Build image and setup container
1. clone the whole repositary
```
git clone https://github.com/ignc-research/arena-rosnav
```
2. Open local terminal under the path where you just clone the repo
3. Compose the docker
```
docker-compose up -d
```

## Start /Enter /Stop the container
1. Check if the arena-rosnav and novnc container is already started
```
docker ps
```
2. Start container (under the path of arena-rosnav)
```
docker-compose start
```
3. Enter the ros contaier
```
docker exec -it arena-rosnav bash
```
4. Stop the container (under the path of arena-rosnav)
```
docker-compose stop
```

## Show the GUI app in ROS by browser
1. Open 'http://localhost:8080/vnc.html'
2. You can adjust the window size to automatic local scale or set fullscreen though the side bar on the left

## Test
1. After entering the container by `docker exec -it arena-rosnav bash` activate the venv by
```
workon rosnav
```
2. Roslaunch in venv
```
roslaunch arena_bringup start_arena_flatland.launch train_mode:=false use_viz:=true local_planner:=dwa map_file:=map1 obs_vel:=0.3

```
3. Open http://localhost:8080/vnc.html you will see the rviz window in browser
3. By setting a 2D Nav Goal manually on white goal point you will see the robot move to the goal automatically

## Develop in VS Code
1. Install plugin Remote - Containers in VS Code
2. Open the arena-rosnav folder in VS Code
3. Click the green icon in the lower left corner (or type `F1`)
4. Select `Remote-Containers: Reopen in Container`
5. Select `From docker-compose.yml`
6. Select `ros`
7. Modify the files which are automatically created by VS Code
* devcontainer.json in .devcontainer folder
You can change the workspaceFolder to "workspaceFolder": "/root/catkin_ws/src/arena-rosnav"
* docker-compose.yml in .devcontainer folder
You can comment the "volumes:- .:/workspace:cached", which is redundant
3 changes: 3 additions & 0 deletions Docker/novnc.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DISPLAY_WIDTH=1920
DISPLAY_HEIGHT=1080
RUN_XTERM=no
4 changes: 4 additions & 0 deletions Docker/ros.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# ROS_MASTER_URI=[IP or HOSTNAME]:11311
# ROS_HOSTNAME=ros
# TB3_MODEL=waffle_pi
# TURTLEBOT3_MODEL=waffle_pi
Empty file modified arena_bringup/launch/plan_fsm_param.yaml
100755 → 100644
Empty file.
Empty file modified arena_bringup/launch/start_arena_flatland.launch
100755 → 100644
Empty file.
42 changes: 42 additions & 0 deletions arena_bringup/launch/sublaunch/amcl.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<launch>
<arg name="scan_topic" default="scan"/>
<arg name="initial_pose_x" default="0.0"/>
<arg name="initial_pose_y" default="0.0"/>
<arg name="initial_pose_a" default="0.0"/>

<node pkg="amcl" type="amcl" name="amcl" clear_params="true">
<param name="min_particles" value="500"/>
<param name="max_particles" value="3000"/>
<param name="kld_err" value="0.02"/>
<param name="update_min_d" value="0.20"/>
<param name="update_min_a" value="0.20"/>
<param name="resample_interval" value="1"/>
<param name="transform_tolerance" value="0.5"/>
<param name="recovery_alpha_slow" value="0.00"/>
<param name="recovery_alpha_fast" value="0.00"/>
<param name="initial_pose_x" value="$(arg initial_pose_x)"/>
<param name="initial_pose_y" value="$(arg initial_pose_y)"/>
<param name="initial_pose_a" value="$(arg initial_pose_a)"/>
<param name="gui_publish_rate" value="50.0"/>

<remap from="scan" to="$(arg scan_topic)"/>
<param name="laser_max_range" value="3.5"/>
<param name="laser_max_beams" value="180"/>
<param name="laser_z_hit" value="0.5"/>
<param name="laser_z_short" value="0.05"/>
<param name="laser_z_max" value="0.05"/>
<param name="laser_z_rand" value="0.5"/>
<param name="laser_sigma_hit" value="0.2"/>
<param name="laser_lambda_short" value="0.1"/>
<param name="laser_likelihood_max_dist" value="2.0"/>
<param name="laser_model_type" value="likelihood_field"/>

<param name="odom_model_type" value="diff"/>
<param name="odom_alpha1" value="0.1"/>
<param name="odom_alpha2" value="0.1"/>
<param name="odom_alpha3" value="0.1"/>
<param name="odom_alpha4" value="0.1"/>
<param name="odom_frame_id" value="odom"/>
<param name="base_frame_id" value="base_footprint"/>
</node>
</launch>
19 changes: 19 additions & 0 deletions arena_bringup/launch/sublaunch/fake_localization.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

<launch>
<arg name="global_frame_id"/>
<arg name="odom_frame_id"/>
<arg name="base_frame_id" />
<arg name="odom_ground_truth"/>

<!-- send fake static transform map_to_odom, which will be used to get localization from odom to map -->
<node pkg="tf2_ros" type="static_transform_publisher" name="map_to_odom_tfpublisher" args="0 0 0 0 0 0 $(arg global_frame_id) $(arg odom_frame_id)"/>

<!-- fake localization node, which will now not be used to send location topic -->
<!-- <node pkg="arena_fake_localization" type="fake_localization" name="fake_localization" output="screen">
<param name="global_frame_id" value="$(arg global_frame_id)"/>
<param name="odom_frame_id" value="$(arg odom_frame_id)"/>
<param name="base_frame_id" value="$(arg base_frame_id)"/>
<param name="base_pose_ground_truth" value="$(arg odom_ground_truth)"/>
</node> -->

</launch>
49 changes: 49 additions & 0 deletions arena_bringup/launch/sublaunch/flatland_simulator.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

<launch>

<!-- ******************** flatland******************** -->
<arg name="world_path"/>
<arg name="update_rate" />
<arg name="step_size" />
<arg name="show_viz" />
<arg name="viz_pub_rate"/>
<arg name="use_rviz"/>
<arg name="rviz_file" default="nav_LP"/>
<arg name="train_mode"/>
<env name="ROSCONSOLE_FORMAT" value="[${severity} ${time} ${logger}]: ${message}" />

<!-- launch flatland server -->
<node name="flatland_server" pkg="flatland_server" type="flatland_server" output="screen">
<param name="world_path" value="$(arg world_path)" />
<param name="update_rate" value="$(arg update_rate)" />
<param name="step_size" value="$(arg step_size)" />
<param name="show_viz" value="$(arg show_viz)" />
<param name="viz_pub_rate" value="$(arg viz_pub_rate)" />
<param name="train_mode" value="$(arg train_mode)" />
</node>


<!-- ***************** Robot Model ***************** -->
<arg name="initial_pose_x" default="0.0"/>
<arg name="initial_pose_y" default="0.0"/>
<arg name="initial_pose_a" default="0.0"/>

<node name="spawn_model" pkg="rosservice" type="rosservice"
args="call --wait /spawn_model &quot;{
yaml_path: '$(find simulator_setup)/robot/myrobot.model.yaml',
name: 'myrobot',
ns: '',
pose: {x: $(arg initial_pose_x), y: $(arg initial_pose_y), theta: $(arg initial_pose_a)}}&quot;"
/>

<!-- ************** flatland viz *************** -->
<group if="$(arg show_viz)">
<node name="flatland_viz" pkg="flatland_viz" type="flatland_viz" output="screen" required="false" unless="$(arg use_rviz)"/>
</group>

<!-- ************** rviz *************** -->
<group if="$(arg use_rviz)">
<node name="flatland_rviz" pkg="rviz" type="rviz" output="screen" args="-d $(find arena_bringup)/rviz/$(arg rviz_file).rviz"/>
</group>

</launch>
15 changes: 15 additions & 0 deletions arena_bringup/launch/sublaunch/move_base.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<launch>

<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen" clear_params="true">
<!-- <param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" /> -->
<rosparam file="$(find arena_bringup)/config/config_movebase/costmap_common_params.yaml" command="load" ns="global_costmap" />
<rosparam file="$(find arena_bringup)/config/config_movebase/costmap_common_params.yaml" command="load" ns="local_costmap" />
<rosparam file="$(find arena_bringup)/config/config_movebase/costmap_local_params.yaml" command="load" />
<rosparam file="$(find arena_bringup)/config/config_movebase/costmap_global_params.yaml" command="load" />

<rosparam file="$(find arena_bringup)/config/config_movebase/move_base_params.yaml" command="load" />
<rosparam file="$(find arena_bringup)/config/config_movebase/global_planner_params.yaml" command="load" />
<rosparam file="$(find arena_bringup)/config/config_movebase/local_planner_dwa_params.yaml" command="load" />
</node>

</launch>
42 changes: 42 additions & 0 deletions arena_bringup/launch/sublaunch/move_base/move_base_cadrl.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<launch>

<!-- move base -->
<arg name="model" default="burger"/>
<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
<rosparam file="$(find conventional)/config/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find conventional)/config/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find conventional)/config/local_costmap_params.yaml" command="load" />
<rosparam file="$(find conventional)/config/global_costmap_params.yaml" command="load" />
</node>


<arg name="tb3_speed" default="0.3"/>
<arg name="file" default="cadrl_node_tb3.py"/>
<!-- Launch neural net ros wrapper -->
<node pkg="cadrl_ros" type="cadrl_node_tb3.py" name="cadrl_node" output="screen" ns="/cadrl">

<!-- Publications -->
<remap from="~other_vels" to="other_vels"/>
<remap from="~nn_cmd_vel" to="/cmd_vel"/>
<remap from="~pose_marker" to="pose_marker"/>
<remap from="~path_marker" to="path_marker"/>
<remap from="~goal_path_marker" to="goal_path_marker"/>
<remap from="~agent_marker" to="other_agents_marker"/>
<remap from="~agent_markers" to="other_agents_markers"/>

<!-- Subscriptions -->
<remap from="~pose" to="/odom"/>
<remap from="~velocity" to="velocity"/>
<remap from="~safe_actions" to="local_path_finder/safe_actions"/>
<remap from="~planner_mode" to="planner_fsm/mode"/>
<remap from="~goal" to="/goal"/>
<remap from="~subgoal" to="/plan_manager/subgoal"/>
<remap from="~clusters" to="/obst_odom"/>
<remap from="~peds" to="ped_manager/ped_recent"/>

<!-- Parameters -->
<param name="~tb3_speed" value="$(arg tb3_speed)"/>

</node>

</launch>
27 changes: 27 additions & 0 deletions arena_bringup/launch/sublaunch/move_base/move_base_dwa.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!-- -->
<launch>
<!-- Arguments -->
<arg name="model" default="burger"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />
<arg name="move_forward_only" default="false"/>

<!-- move_base -->
<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" />
<rosparam file="$(find conventional)/config/tb3/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find conventional)/config/tb3/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find conventional)/config/tb3/local_costmap_params.yaml" command="load" />
<rosparam file="$(find conventional)/config/tb3/global_costmap_params.yaml" command="load" />
<rosparam file="$(find conventional)/config/tb3/move_base_params.yaml" command="load" />


<rosparam file="$(find conventional)/config/tb3/dwa_local_planner_params_burger.yaml" command="load" />
<remap from="cmd_vel" to="$(arg cmd_vel_topic)"/>
<remap from="odom" to="$(arg odom_topic)"/>
<param name="DWAPlannerROS/min_vel_x" value="0.0" if="$(arg move_forward_only)" />
<param name="controller_frequency" value="5.0" />
<param name="planner_frequency" value="0.0" />

</node>
</launch>
Loading