diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b25c15b81fae06e1c55946ac6270bfdb293870e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0833f8898dffc0f4ef2a81321e9155e449d2362a..9b42575b37fa31256a63c250297386450959886c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,10 @@ project(lrs_interaction_msgs) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages -find_package(catkin REQUIRED) +find_package(catkin REQUIRED COMPONENTS + message_generation + lrs_msgs_common + ) ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system) @@ -50,11 +53,10 @@ find_package(catkin REQUIRED) # ) ## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) +add_service_files( + FILES + AddProtocolInstance.srv +) ## Generate actions in the 'action' folder # add_action_files( @@ -64,10 +66,10 @@ find_package(catkin REQUIRED) # ) ## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs # Or other packages containing msgs -# ) +generate_messages( + DEPENDENCIES + lrs_msgs_common # Or other packages containing msgs +) ################################################ ## Declare ROS dynamic reconfigure parameters ## @@ -112,8 +114,7 @@ catkin_package( ## Specify additional locations of header files ## Your package locations should be listed before other locations include_directories( -# include -# ${catkin_INCLUDE_DIRS} + ${catkin_INCLUDE_DIRS} ) ## Declare a C++ library diff --git a/package.xml b/package.xml index 82913e63f92f08bd5a79415d51c36fadc1076571..13057c7f7933479be7661fd3fe7721137fe644cf 100644 --- a/package.xml +++ b/package.xml @@ -49,6 +49,9 @@ <!-- Use doc_depend for packages you need only for building documentation: --> <!-- <doc_depend>doxygen</doc_depend> --> <buildtool_depend>catkin</buildtool_depend> + <depend>lrs_msgs_common</depend> + <build_depend>message_generation</build_depend> + <exec_depend>message_runtime</exec_depend> <!-- The export tag contains other, unspecified, tags --> diff --git a/srv/AddProtocolInstance.srv b/srv/AddProtocolInstance.srv new file mode 100644 index 0000000000000000000000000000000000000000..27cd1f98ae4ef3f9a2f5f21bc968364e4cdcd475 --- /dev/null +++ b/srv/AddProtocolInstance.srv @@ -0,0 +1,7 @@ + +string uuid # uuid can be used to access possible result of the protocol +lrs_msgs_common/SimpleAcl acl # Start message in the protocol +--- +bool success +int32 error +string reason