Skip to content

Commit

Permalink
basic actions added
Browse files Browse the repository at this point in the history
  • Loading branch information
RafaelRey committed Oct 21, 2019
1 parent 6222124 commit 6ce87fc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 20 deletions.
32 changes: 13 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ project(upo_actions)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
std_msgs
actionlib
actionlib_msgs
genmsg
Expand All @@ -17,15 +18,6 @@ find_package(catkin REQUIRED COMPONENTS
trajectory_msgs
)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)


## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()

################################################
## Declare ROS messages, services and actions ##
################################################
Expand Down Expand Up @@ -65,17 +57,19 @@ find_package(catkin REQUIRED COMPONENTS
# )

## Generate actions in the 'action' folder
# add_action_files(
# FILES
# Action1.action
# Action2.action
# )
add_action_files(
FILES
ExecutePath.action
MakePlan.action
Navigate.action
RotationInPlace.action
)

## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
# actionlib_msgs# geometry_msgs# trajectory_msgs
# )
generate_messages(
DEPENDENCIES
actionlib_msgs geometry_msgs trajectory_msgs std_msgs
)

################################################
## Declare ROS dynamic reconfigure parameters ##
Expand Down Expand Up @@ -109,7 +103,7 @@ find_package(catkin REQUIRED COMPONENTS
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES upo_actions
# CATKIN_DEPENDS actionlib actionlib_msgs genmsg geometry_msgs message_generation roscpp trajectory_msgs
CATKIN_DEPENDS actionlib actionlib_msgs genmsg geometry_msgs message_generation roscpp trajectory_msgs
# DEPENDS system_lib
)

Expand Down
4 changes: 3 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<build_depend>message_generation</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>trajectory_msgs</build_depend>
<build_depend>genmsg</build_depend>
<build_export_depend>actionlib</build_export_depend>
<build_export_depend>actionlib_msgs</build_export_depend>
<build_export_depend>geometry_msgs</build_export_depend>
Expand All @@ -66,7 +67,8 @@
<exec_depend>geometry_msgs</exec_depend>
<exec_depend>roscpp</exec_depend>
<exec_depend>trajectory_msgs</exec_depend>

<exec_depend>genmsg</exec_depend>
<exec_depend>message_generation</exec_depend>

<!-- The export tag contains other, unspecified, tags -->
<export>
Expand Down

0 comments on commit 6ce87fc

Please sign in to comment.