correct merge
This commit is contained in:
parent
0495bc4dcd
commit
7f605f27a1
75 changed files with 1984 additions and 3559 deletions
|
@ -6,9 +6,9 @@ if(NOT CMAKE_C_STANDARD)
|
|||
set(CMAKE_C_STANDARD 99)
|
||||
endif()
|
||||
|
||||
# Default to C++14
|
||||
# Default to C++17
|
||||
if(NOT CMAKE_CXX_STANDARD)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
|
@ -19,12 +19,14 @@ endif()
|
|||
find_package(ament_cmake REQUIRED)
|
||||
find_package(rosidl_default_generators REQUIRED)
|
||||
find_package(geometry_msgs REQUIRED)
|
||||
find_package(std_msgs REQUIRED)
|
||||
|
||||
set(msg_files
|
||||
"msg/GraspPose.msg"
|
||||
)
|
||||
|
||||
set(srv_files
|
||||
"srv/PrintPart.srv"
|
||||
"srv/GetGraspPose.srv"
|
||||
"srv/GetGraspPoses.srv"
|
||||
"srv/GetPart.srv"
|
||||
|
@ -33,7 +35,7 @@ set(srv_files
|
|||
rosidl_generate_interfaces(${PROJECT_NAME}
|
||||
${msg_files}
|
||||
${srv_files}
|
||||
DEPENDENCIES geometry_msgs
|
||||
DEPENDENCIES geometry_msgs std_msgs
|
||||
)
|
||||
|
||||
if(BUILD_TESTING)
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
<build_depend>rosidl_default_generators</build_depend>
|
||||
|
||||
<exec_depend>rosidl_default_runtime</exec_depend>
|
||||
<depend>geometry_msgs</depend>
|
||||
<depend>std_msgs</depend>
|
||||
|
||||
<test_depend>ament_lint_auto</test_depend>
|
||||
<test_depend>ament_lint_common</test_depend>
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
string frame_id
|
||||
string printer_id
|
||||
---
|
||||
#result definition
|
||||
bool success # indicate successful run of triggered service
|
||||
string message # informational, e.g. for error messages
|
Loading…
Add table
Add a link
Reference in a new issue