Skip to content

Commit 002b54c

Browse files
xgroleauEtienne
andauthored
Feat/swarinfo 588 turtlebot adaptation (#73)
* New Footprint and main launchfile * Removed RVIZ and fix move_base launch * Fix move_base link * hive_mind_bridge port * Changed default port * Adjusted turtlebot_footprint Co-authored-by: Etienne <vile2094@usherbrooke.ca>
1 parent 5fae611 commit 002b54c

4 files changed

Lines changed: 23 additions & 15 deletions

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
<launch>
3+
<!-- Launchfile that starts the turtlebot navigation stack, serial communication with the OpenCr and the sensors -->
4+
5+
<include file="$(find turtlebot3_bringup)/launch/turtlebot3_robot.launch"/>
6+
7+
<include file="$(find swarmus_turtlebot)/launch/turtlebot.launch">
8+
<arg name="model" value="burger"/>
9+
<arg name="slam_methods" value="gmapping"/>
10+
</include>
11+
12+
</launch>

src/swarmus_turtlebot/launch/move_base.launch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<!-- move_base -->
99
<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
1010
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" />
11-
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
12-
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
13-
<rosparam file="$(find turtlebot3_navigation)/param/local_costmap_params.yaml" command="load" />
14-
<rosparam file="$(find turtlebot3_navigation)/param/global_costmap_params.yaml" command="load" />
15-
<rosparam file="$(find turtlebot3_navigation)/param/move_base_params.yaml" command="load" />
16-
<rosparam file="$(find turtlebot3_navigation)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
11+
<rosparam file="$(find swarmus_turtlebot)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
12+
<rosparam file="$(find swarmus_turtlebot)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
13+
<rosparam file="$(find swarmus_turtlebot)/param/local_costmap_params.yaml" command="load" />
14+
<rosparam file="$(find swarmus_turtlebot)/param/global_costmap_params.yaml" command="load" />
15+
<rosparam file="$(find swarmus_turtlebot)/param/move_base_params.yaml" command="load" />
16+
<rosparam file="$(find swarmus_turtlebot)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
1717
<remap from="cmd_vel" to="$(arg cmd_vel_topic)"/>
1818
<remap from="odom" to="$(arg odom_topic)"/>
1919
<param name="DWAPlannerROS/min_vel_x" value="0.0" if="$(arg move_forward_only)" />

src/swarmus_turtlebot/launch/turtlebot.launch

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
<arg name="slam_methods" default="gmapping" doc="slam type [gmapping, cartographer, hector, karto, frontier_exploration]"/>
1010
<arg name="configuration_basename" default="turtlebot3_lds_2d.lua"/>
11+
<arg name="robot_name" default=""/>
1112

1213
<!-- Turtlebot3 -->
1314
<include file="$(find turtlebot3_bringup)/launch/turtlebot3_remote.launch">
1415
<arg name="model" value="$(arg model)" />
16+
<arg name="multi_robot_name" value="$(arg robot_name)"/>
1517
</include>
1618

1719
<!-- Bridge -->
@@ -24,14 +26,8 @@
2426
</include>
2527

2628
<!-- move_base -->
27-
<include file="$(find turtlebot3_navigation)/launch/move_base.launch">
28-
<arg name="model" value="$(arg model)" />
29+
<include file="$(find swarmus_turtlebot)/launch/move_base.launch">
30+
<arg name="model" value="$(arg model)"/>
2931
<arg name="move_forward_only" value="$(arg move_forward_only)"/>
3032
</include>
31-
32-
<!-- rviz -->
33-
<group if="$(arg open_rviz)">
34-
<node pkg="rviz" type="rviz" name="rviz" required="true"
35-
args="-d $(find turtlebot3_navigation)/rviz/turtlebot3_navigation.rviz"/>
36-
</group>
3733
</launch>

src/swarmus_turtlebot/param/costmap_common_params_burger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
obstacle_range: 3.0
22
raytrace_range: 3.5
33

4-
footprint: [[-0.105, -0.105], [-0.105, 0.105], [0.041, 0.105], [0.041, -0.105]]
4+
footprint: [[-0.28,-0.21], [-0.28,0.21], [0.15, 0.21], [0.15,-0.21]]
55
#robot_radius: 0.105
66

77
inflation_radius: 1.0

0 commit comments

Comments
 (0)