diff --git a/behaviortree_ros2/CMakeLists.txt b/behaviortree_ros2/CMakeLists.txt index edf1440d..68e2afa2 100644 --- a/behaviortree_ros2/CMakeLists.txt +++ b/behaviortree_ros2/CMakeLists.txt @@ -29,13 +29,18 @@ add_library(${PROJECT_NAME} src/bt_utils.cpp src/tree_execution_server.cpp ) -ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_DEPS}) - target_include_directories(${PROJECT_NAME} PUBLIC $ $) -target_link_libraries(${PROJECT_NAME} bt_executor_parameters) +target_link_libraries(${PROJECT_NAME} PUBLIC + rclcpp::rclcpp + rclcpp_action::rclcpp_action + ament_index_cpp::ament_index_cpp + behaviortree_cpp::behaviortree_cpp + ${btcpp_ros2_interfaces_TARGETS} + bt_executor_parameters +) ###################################################### diff --git a/behaviortree_ros2/include/behaviortree_ros2/bt_service_node.hpp b/behaviortree_ros2/include/behaviortree_ros2/bt_service_node.hpp index 77958cd5..804c0906 100644 --- a/behaviortree_ros2/include/behaviortree_ros2/bt_service_node.hpp +++ b/behaviortree_ros2/include/behaviortree_ros2/bt_service_node.hpp @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include "behaviortree_cpp/bt_factory.h" #include "behaviortree_ros2/ros_node_params.hpp" @@ -216,8 +218,14 @@ inline RosServiceNode::ServiceClientInstance::ServiceClientInstance( node->create_callback_group(rclcpp::CallbackGroupType::MutuallyExclusive, false); callback_executor.add_callback_group(callback_group, node->get_node_base_interface()); + // For Jazzy and Later Support + #if RCLCPP_VERSION_GTE(28, 0, 0) + service_client = node->create_client(service_name, rclcpp::ServicesQoS(), + callback_group); + #else service_client = node->create_client(service_name, rmw_qos_profile_services_default, callback_group); + #endif } template diff --git a/behaviortree_ros2/pixi.toml b/behaviortree_ros2/pixi.toml new file mode 100644 index 00000000..83361a2f --- /dev/null +++ b/behaviortree_ros2/pixi.toml @@ -0,0 +1,9 @@ +# Package manifest for Pixi: builds this ROS 2 package as a conda package. +# Name, version and dependencies come from package.xml. See the CoreSense +# guide: https://coresenseeu.github.io/tutorials/docs/pixi_release.html +[package] +publish = true + +[package.build.backend] +name = "pixi-build-ros" +workspace = true diff --git a/btcpp_ros2_interfaces/pixi.toml b/btcpp_ros2_interfaces/pixi.toml new file mode 100644 index 00000000..83361a2f --- /dev/null +++ b/btcpp_ros2_interfaces/pixi.toml @@ -0,0 +1,9 @@ +# Package manifest for Pixi: builds this ROS 2 package as a conda package. +# Name, version and dependencies come from package.xml. See the CoreSense +# guide: https://coresenseeu.github.io/tutorials/docs/pixi_release.html +[package] +publish = true + +[package.build.backend] +name = "pixi-build-ros" +workspace = true