diff --git a/rbs_bt_executor/CMakeLists.txt b/rbs_bt_executor/CMakeLists.txt index 78910e9..bb5147b 100644 --- a/rbs_bt_executor/CMakeLists.txt +++ b/rbs_bt_executor/CMakeLists.txt @@ -27,6 +27,7 @@ find_package(env_manager_interfaces REQUIRED) find_package(rbs_utils REQUIRED) find_package(tf2_eigen REQUIRED) find_package(tf2_ros REQUIRED) +find_package(rbs_utils_interfaces REQUIRED) if (NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) @@ -52,6 +53,7 @@ set(dependencies rbs_utils tf2_ros tf2_eigen + rbs_utils_interfaces ) include_directories(include) @@ -59,11 +61,11 @@ include_directories(include) add_library(rbs_skill_move_topose_bt_action_client SHARED src/MoveToPose.cpp) list(APPEND plugin_libs rbs_skill_move_topose_bt_action_client) -add_library(rbs_skill_gripper_move_bt_action_client SHARED src/MoveGripper.cpp) +add_library(rbs_skill_gripper_move_bt_action_client SHARED src/GripperCommand.cpp) list(APPEND plugin_libs rbs_skill_gripper_move_bt_action_client) -# add_library(rbs_skill_get_pick_place_pose_service_client SHARED src/GetPickPlacePoses.cpp) -# list(APPEND plugin_libs rbs_skill_get_pick_place_pose_service_client) +add_library(rbs_skill_get_pick_place_pose_service_client SHARED src/GetGraspPose.cpp) +list(APPEND plugin_libs rbs_skill_get_pick_place_pose_service_client) add_library(rbs_skill_move_joint_state SHARED src/MoveToJointStates.cpp) list(APPEND plugin_libs rbs_skill_move_joint_state) diff --git a/rbs_bt_executor/bt_trees/grasp_object.xml b/rbs_bt_executor/bt_trees/grasp_object.xml index 3a64022..223245c 100644 --- a/rbs_bt_executor/bt_trees/grasp_object.xml +++ b/rbs_bt_executor/bt_trees/grasp_object.xml @@ -3,23 +3,43 @@ -