Skip to content

Commit

Permalink
ast_move_base usages renamed to ss_turtle3_move_base,
Browse files Browse the repository at this point in the history
housekeeping for launchers and etc
  • Loading branch information
KushnirDmytro committed Mar 21, 2019
1 parent 932a651 commit 810e2ce
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 39 deletions.
6 changes: 1 addition & 5 deletions ast_stack/launch/combined_bringup.launch
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<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" />

Expand All @@ -19,7 +17,6 @@
<!--<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')"/>
Expand Down Expand Up @@ -72,7 +69,7 @@


<!-- move_base -->
<include file="$(find ast_move_base)/launch/move_base.launch">
<include file="$(find ss_turtle3_move_base)/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" />
Expand All @@ -84,5 +81,4 @@
</include>



</launch>
2 changes: 1 addition & 1 deletion ast_stack/launch/combined_bringup_p_worlds.launch
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@


<!-- move_base -->
<include file="$(find ast_move_base)/launch/move_base.launch">
<include file="$(find ss_turtle3_move_base)/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" />
Expand Down
2 changes: 1 addition & 1 deletion ast_stack/launch/robot_launch_manual_explore_PC.launch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


<!-- move_base -->
<include file="$(find ast_move_base)/launch/move_base.launch">
<include file="$(find ss_turtle3_move_base)/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" />
Expand Down
2 changes: 1 addition & 1 deletion ast_stack/launch/tuning_table.launch
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@


<!-- move_base -->
<include file="$(find ast_move_base)/launch/move_base.launch">
<include file="$(find ss_turtle3_move_base)/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" />
Expand Down
2 changes: 1 addition & 1 deletion ast_stack/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<!--<depend>turtlebot3_msgs</depend>-->
<!--<depend>turtlebot3_navigation</depend>-->
<depend>explore_lite</depend> <!--one from m-explore package-->
<depend>ast_explore_lite</depend> <!--one from m-explore package-->


<!-- Use build_depend for packages you need at compile time: -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(ast_move_base)
project(ss_turtle3_move_base)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand All @@ -8,9 +8,10 @@ project(ast_move_base)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
geometry_msg
roscpp
rospy
std_msgs
geometry_msgs
roscpp
rospy
)

## System dependencies are found with CMake's conventions
Expand Down Expand Up @@ -104,7 +105,7 @@ find_package(catkin REQUIRED COMPONENTS
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES ast_move_base
# LIBRARIES ss_turtle3_move_base
# CATKIN_DEPENDS geometry_msg roscpp rospy
# DEPENDS system_lib
)
Expand All @@ -116,13 +117,13 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(
# include
# includ
${catkin_INCLUDE_DIRS}
)

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/ast_move_base.cpp
# src/${PROJECT_NAME}/ss_turtle3_move_base.cpp
# )

## Add cmake target dependencies of the library
Expand All @@ -133,7 +134,7 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/ast_move_base_node.cpp)
# add_executable(${PROJECT_NAME}_node src/ss_turtle3_move_base_node.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
Expand Down Expand Up @@ -190,7 +191,7 @@ include_directories(
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_ast_move_base.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_ss_turtle3_move_base.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@



<launch>
<arg name="model" default="$(env TURTLEBOT3_MODEL)" doc="model type [burger, waffle, waffle_pi]"/>
<arg name="cmd_vel_topic" default="/cmd_vel" />
Expand All @@ -15,22 +12,22 @@
<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 ast_move_base)/param/move_base.yaml" command="load" />
<rosparam file="$(find ss_turtle3_move_base)/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 ast_move_base)/param/costmap_common_params_$(arg model).yaml" command="load" ns="global_costmap" />
<rosparam file="$(find ss_turtle3_move_base)/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 ast_move_base)/param/costmap_common_params_$(arg model).yaml" command="load" ns="local_costmap" />
<rosparam file="$(find ss_turtle3_move_base)/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 ast_move_base)/param/local_costmap_params.yaml" command="load" />
<rosparam file="$(find ss_turtle3_move_base)/param/local_costmap_params.yaml" command="load" />

<rosparam file="$(find turtlebot3_navigation)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find ast_move_base)/param/global_costmap_params.yaml" command="load" />
<rosparam file="$(find ss_turtle3_move_base)/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 ast_move_base)/param/dwa_local_planner_params_$(arg model).yaml" command="load" />
<rosparam file="$(find ss_turtle3_move_base)/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)"/>
Expand Down
20 changes: 8 additions & 12 deletions ast_move_base/package.xml → ss_turtle3_move_base/package.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="2">
<name>ast_move_base</name>
<name>ss_turtle3_move_base</name>
<version>0.0.0</version>
<description>The ast_move_base package</description>
<description>The ss_turtle3_move_base package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
Expand All @@ -19,7 +19,7 @@
<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/ast_move_base</url> -->
<!-- <url type="website">http://wiki.ros.org/ss_turtle3_move_base</url> -->


<!-- Author tags are optional, multiple are allowed, one per tag -->
Expand Down Expand Up @@ -49,15 +49,11 @@
<!-- Use doc_depend for packages you need only for building documentation: -->
<!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>geometry_msg</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>rospy</build_depend>
<build_export_depend>geometry_msg</build_export_depend>
<build_export_depend>roscpp</build_export_depend>
<build_export_depend>rospy</build_export_depend>
<exec_depend>geometry_msg</exec_depend>
<exec_depend>roscpp</exec_depend>
<exec_depend>rospy</exec_depend>
<depend>std_msgs</depend>
<depend>geometry_msgs</depend>
<depend>roscpp</depend>
<depend>rospy</depend>



<!-- The export tag contains other, unspecified, tags -->
Expand Down
File renamed without changes.

0 comments on commit 810e2ce

Please sign in to comment.