Skip to content

Commit

Permalink
Merge pull request #15 from SoftServeSAG/F#4_move_base_configuring
Browse files Browse the repository at this point in the history
F#4 move base configuring
  • Loading branch information
DmytroKushnirSoftserveinc authored Mar 11, 2019
2 parents d511ba9 + 5405a02 commit a9a2d21
Show file tree
Hide file tree
Showing 42 changed files with 867 additions and 388 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ msg/_*.py
build_isolated/
devel_isolated/
agitr/
cr2_gazebo/
explore_stack/worlds/p_worlds

# Generated by dynamic reconfigure
*.cfgc
Expand Down
11 changes: 11 additions & 0 deletions explore_lite_revised/param/explore_lite_revised.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
robot_base_frame: base_link
min_frontier_size: 0.75
costmap_topic: map
costmap_updates_topic: map_updates
visualize: true
planner_frequency: 0.33
progress_timeout: 30.0
potential_scale: 3.0
orientation_scale: 0.0
gain_scale": 1.0
transform_tolerance: 0.3
63 changes: 14 additions & 49 deletions explore_stack/launch/combined_bringup.launch
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@


<!--GAZEBO-->
<!--<arg name="world_name" default="turtlebot3_house"/>-->
<arg name="world_name" default="turtlebot3_stage_3"/>
<arg name="world_name" default="turtlebot3_house"/>
<!--<arg name="world_name" default="turtlebot3_stage_3"/>-->


<arg name="x_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>
Expand Down Expand Up @@ -51,7 +51,7 @@
<node name="rviz"
pkg="rviz"
type="rviz"
args="-d $(find explore_stack)/rviz/explore_lite_vanilla.rviz"
args="-d $(find explore_stack)/rviz/move_base_tuning.rviz"
/>


Expand All @@ -70,55 +70,20 @@




<!-- move_base -->
<node pkg="move_base"
type="move_base"
respawn="false"
name="move_base"
output="screen"
launch-prefix="xterm -e">
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" />
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find turtlebot3_navigation)/param/local_costmap_params.yaml" command="load" />

<rosparam file="$(find explore_stack)/param/local_costmap_params.yaml" command="load" />
<rosparam file="$(find turtlebot3_navigation)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find turtlebot3_navigation)/param/move_base_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/move_base_params.yaml" command="load" />

<rosparam file="$(find turtlebot3_navigation)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
<remap from="cmd_vel" to="$(arg cmd_vel_topic)"/>
<remap from="odom" to="$(arg odom_topic)"/>
</node>
<!--/ move_base -->



<!--<include file="$(find explore_lite_revised)/launch/explore.launch" launch-prefix="xterm -e">-->
<include file="$(find explore_stack)/launch/move_base.launch">
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />
</include>
<!-- /move_base -->


<include file="$(find explore_stack)/launch/explore_lite_revised.launch">
<!--TODO parameters tuning if needed-->
<!--TODO name and dir for map save-->
<!--</include>-->
<node pkg="explore_lite_revised"
type="explore_lite_revised"
name="explore_lite_revised"
respawn="false"
output="screen"
launch-prefix="xterm -geometry 93x31+100+350 -e">
<!--todo manage terminal postion a little bit better-->
<param name="robot_base_frame" value="base_link"/>
<param name="costmap_topic" value="map"/>
<param name="costmap_updates_topic" value="map_updates"/>
<param name="visualize" value="true"/>
<param name="planner_frequency" value="0.33"/>
<param name="progress_timeout" value="30.0"/>
<param name="potential_scale" value="3.0"/>
<param name="orientation_scale" value="0.0"/>
<param name="gain_scale" value="1.0"/>
<param name="transform_tolerance" value="0.3"/>
<param name="min_frontier_size" value="0.75"/>
</node>
</include>



Expand Down
93 changes: 93 additions & 0 deletions explore_stack/launch/combined_bringup_p_worlds.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<launch>
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>



<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />


<include file="$(find turtlebot3_bringup)/launch/turtlebot3_remote.launch">
<arg name="model" value="$(arg model)"/>
</include>

<include file="$(find velocity_topic_watchdog)/launch/velocity_topic_watchdog.launch">
</include>


<!--GAZEBO-->
<!--<arg name="world_name" default="turtlebot3_house"/>-->
<!--<arg name="world_name" default="turtlebot3_stage_3"/>-->
<arg name="world_name" default="ss_hq4"/>
<!--<arg name="world_name" default="office"/>-->


<arg name="x_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>
<arg name="y_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>
<arg name="z_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>
<arg name="x_pos" default="-3.0" if="$(eval world_name == 'turtlebot3_house')"/>
<arg name="y_pos" default="1.0" if="$(eval world_name == 'turtlebot3_house')"/>
<arg name="z_pos" default="0.0" if="$(eval world_name == 'turtlebot3_house')"/>


<!--http://answers.gazebosim.org/question/16076/running-gazebo-on-docker-affects-simulation-speed-meshes-and-world-objects/-->
<include file="$(find gazebo_ros)/launch/empty_world.launch" >
<arg name="world_name" value="$(find explore_stack)/worlds/p_worlds/$(arg world_name).world"/>
<arg name="paused" value="false"/>
<arg name="use_sim_time" value="true"/>
<arg name="gui" value="false"/>
<arg name="headless" value="false"/>
<arg name="debug" value="false"/>
</include>

<param name="robot_description"
command="$(find xacro)/xacro --inorder $(find turtlebot3_description)/urdf/turtlebot3_$(arg model).urdf.xacro" />

<node name="spawn_urdf"
pkg="gazebo_ros"
type="spawn_model"
args="-urdf -model turtlebot3 -x $(arg x_pos) -y $(arg y_pos) -z $(arg z_pos) -param robot_description" />
<!--GAZEBO-->


<node name="rviz"
pkg="rviz"
type="rviz"
args="-d $(find explore_stack)/rviz/explore_lite_tb3.rviz"
/>



<!-- SLAM: Gmapping, Cartographer, Hector, Karto, Frontier_exploration, RTAB-Map -->
<arg name="slam_methods" default="gmapping" doc="slam type [gmapping, cartographer, hector, karto, frontier_exploration]"/>

<arg name="configuration_basename" default="turtlebot3_lds_2d.lua"/>


<include file="$(find turtlebot3_slam)/launch/turtlebot3_$(arg slam_methods).launch">
<arg name="model" value="$(arg model)"/>
<arg name="configuration_basename" value="$(arg configuration_basename)"/>
</include>
<!--/ SLAM: Gmapping, Cartographer, Hector, Karto, Frontier_exploration, RTAB-Map -->



<!-- move_base -->
<include file="$(find explore_stack)/launch/move_base.launch">
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />
</include>
<!-- /move_base -->




<include file="$(find explore_stack)/launch/explore_lite_revised.launch">
<!--TODO parameters tuning if needed-->
<!--TODO name and dir for map save-->
</include>



</launch>
15 changes: 15 additions & 0 deletions explore_stack/launch/explore_lite_revised.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<launch>
<node pkg="explore_lite_revised"
type="explore_lite_revised"
name="explore_lite_revised"
respawn="false"
output="screen"
launch-prefix="xterm -geometry 93x31+100+350 -e">
<!--todo manage terminal postion a little bit better-->

<rosparam file="$(find explore_lite_revised)/param/explore_lite_revised.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/explore_lite_revised.yaml" command="load" />
</node>

</launch>

39 changes: 39 additions & 0 deletions explore_stack/launch/move_base.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@



<launch>
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />

<node pkg="move_base"
type="move_base"
respawn="false"
name="move_base"
output="screen"
launch-prefix="xterm -e">
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" />

<rosparam file="$(find turtlebot3_navigation)/param/move_base_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/move_base.yaml" command="load" />

<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find explore_stack)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find explore_stack)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />

<rosparam file="$(find turtlebot3_navigation)/param/local_costmap_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/local_costmap_params.yaml" command="load" />

<rosparam file="$(find turtlebot3_navigation)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/global_costmap_params.yaml" command="load" />


<rosparam file="$(find turtlebot3_navigation)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
<rosparam file="$(find explore_stack)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />

<remap from="cmd_vel" to="$(arg cmd_vel_topic)"/>
<remap from="odom" to="$(arg odom_topic)"/>
</node>

</launch>
109 changes: 11 additions & 98 deletions explore_stack/launch/robot_launch.launch
Original file line number Diff line number Diff line change
Expand Up @@ -7,82 +7,20 @@
<arg name="odom_topic" default="odom" />


<include file="$(find turtlebot3_bringup)/launch/turtlebot3_robot.launch">
</include>

<!--<include file="$(find turtlebot3_navigation)/launch/move_base.launch"/>-->
<!-- move_base -->
<node pkg="move_base"
type="move_base"
respawn="false"
name="move_base"
output="screen"
launch-prefix="xterm -e">
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS" />
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find turtlebot3_navigation)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find explore_stack)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find explore_stack)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />


<rosparam file="$(find turtlebot3_navigation)/param/local_costmap_params.yaml" command="load" />

<rosparam file="$(find explore_stack)/param/local_costmap_params.yaml" command="load" />
<rosparam file="$(find turtlebot3_navigation)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find turtlebot3_navigation)/param/move_base_params.yaml" command="load" />
<rosparam file="$(find explore_stack)/param/move_base_params.yaml" command="load" />

<rosparam file="$(find turtlebot3_navigation)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
<rosparam file="$(find explore_stack)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />


<remap from="cmd_vel" to="$(arg cmd_vel_topic)"/>
<remap from="odom" to="$(arg odom_topic)"/>
</node>

<!--/ move_base -->



<!--GAZEBO-->
<!--<arg name="world_name" default="turtlebot3_house"/>-->
<!--<arg name="world_name" default="turtlebot3_stage_3"/>-->


<!--<arg name="x_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>-->
<!--<arg name="y_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>-->
<!--<arg name="z_pos" default="0.0" unless="$(eval world_name == 'turtlebot3_house')"/>-->
<!--<arg name="x_pos" default="-3.0" if="$(eval world_name == 'turtlebot3_house')"/>-->
<!--<arg name="y_pos" default="1.0" if="$(eval world_name == 'turtlebot3_house')"/>-->
<!--<arg name="z_pos" default="0.0" if="$(eval world_name == 'turtlebot3_house')"/>-->


<!--http://answers.gazebosim.org/question/16076/running-gazebo-on-docker-affects-simulation-speed-meshes-and-world-objects/-->
<!--<include file="$(find gazebo_ros)/launch/empty_world.launch">-->
<!--<arg name="world_name" value="$(find explore_stack)/worlds/$(arg world_name).world"/>-->
<!--<arg name="paused" value="false"/>-->
<!--<arg name="use_sim_time" value="true"/>-->
<!--<arg name="gui" value="false"/>-->
<!--<arg name="headless" value="false"/>-->
<!--<arg name="debug" value="false"/>-->
<!--<include file="$(find turtlebot3_bringup)/launch/turtlebot3_robot.launch">-->
<!--</include>-->

<!--<param name="robot_description"-->
<!--command="$(find xacro)/xacro &#45;&#45;inorder $(find turtlebot3_description)/urdf/turtlebot3_$(arg model).urdf.xacro" />-->
<!--<include file="$(find turtlebot3_navigation)/launch/move_base.launch"/>-->

<!--<node name="spawn_urdf"-->
<!--pkg="gazebo_ros"-->
<!--type="spawn_model"-->
<!--args="-urdf -model turtlebot3 -x $(arg x_pos) -y $(arg y_pos) -z $(arg z_pos) -param robot_description" />-->
<!--GAZEBO-->
<!-- move_base -->
<include file="$(find explore_stack)/launch/move_base.launch">
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
<arg name="odom_topic" default="odom" />
</include>
<!-- /move_base -->


<!--<node name="rviz"-->
<!--pkg="rviz"-->
<!--type="rviz"-->
<!--args="-d $(find explore_stack)/rviz/explore_lite_vanilla.rviz"-->
<!--/>-->


<!-- SLAM: Gmapping, Cartographer, Hector, Karto, Frontier_exploration, RTAB-Map -->
Expand All @@ -93,36 +31,11 @@
<include file="$(find turtlebot3_slam)/launch/turtlebot3_slam.launch">
<arg name="slam_methods" value="$(arg slam_methods)"/>
</include>
<!--<include file="$(find turtlebot3_slam)/launch/turtlebot3_$(arg slam_methods).launch">-->
<!--<arg name="model" value="$(arg model)"/>-->
<!--<arg name="configuration_basename" value="$(arg configuration_basename)"/>-->
<!--</include>-->
<!--/ SLAM: Gmapping, Cartographer, Hector, Karto, Frontier_exploration, RTAB-Map -->



<!--<include file="$(find explore_lite_revised)/launch/explore.launch" launch-prefix="xterm -e">-->
<include file="$(find explore_stack)/launch/explore_lite_revised.launch">
<!--TODO parameters tuning if needed-->
<!--TODO name and dir for map save-->
<!--</include>-->
<node pkg="explore_lite_revised"
type="explore_lite_revised"
name="explore_lite_revised"
respawn="false"
output="screen"
launch-prefix="xterm -geometry 93x31+100+350 -e">
<!--todo manage terminal postion a little bit better-->
<param name="robot_base_frame" value="base_link"/>
<param name="costmap_topic" value="map"/>
<param name="costmap_updates_topic" value="map_updates"/>
<param name="visualize" value="true"/>
<param name="planner_frequency" value="0.33"/>
<param name="progress_timeout" value="30.0"/>
<param name="potential_scale" value="3.0"/>
<param name="orientation_scale" value="0.0"/>
<param name="gain_scale" value="1.0"/>
<param name="transform_tolerance" value="0.3"/>
<param name="min_frontier_size" value="0.75"/>
</node>
</include>

</launch>
Loading

0 comments on commit a9a2d21

Please sign in to comment.