From 01fbd7d4b73207802a4dbae1c786f02611beabe5 Mon Sep 17 00:00:00 2001 From: Shivang Patel Date: Thu, 7 May 2020 13:04:39 -0400 Subject: [PATCH 1/4] Refactor deprecated code --- .../include/nav2_behavior_tree/bt_service_node.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp index f0cf0f21c9..f132f2953e 100644 --- a/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp +++ b/nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp @@ -98,13 +98,13 @@ class BtServiceNode : public BT::SyncActionNode virtual BT::NodeStatus check_future( std::shared_future future_result) { - rclcpp::executor::FutureReturnCode rc; + rclcpp::FutureReturnCode rc; rc = rclcpp::spin_until_future_complete( node_, future_result, server_timeout_); - if (rc == rclcpp::executor::FutureReturnCode::SUCCESS) { + if (rc == rclcpp::FutureReturnCode::SUCCESS) { return BT::NodeStatus::SUCCESS; - } else if (rc == rclcpp::executor::FutureReturnCode::TIMEOUT) { + } else if (rc == rclcpp::FutureReturnCode::TIMEOUT) { RCLCPP_WARN( node_->get_logger(), "Node timed out while executing service call to %s.", service_name_.c_str()); From 4ca2de67957e67830e68e873bd8aa17ac77e4e78 Mon Sep 17 00:00:00 2001 From: Shivang Patel Date: Fri, 8 May 2020 22:55:37 -0400 Subject: [PATCH 2/4] Add ompl repo (for test) --- tools/ros2_dependencies.repos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index df9e1a177a..27d7f612a2 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -22,3 +22,7 @@ repositories: type: git url: https://github.com/ros-perception/vision_opencv.git version: ros2 + ompl: + type: git + url: https://github.com/ros-gbp/ompl-release.git + version: release/dashing/ompl/1.4.2-1 From c58d10baeb047fa15f27db7d47c509150c0dbf7b Mon Sep 17 00:00:00 2001 From: Shivang Patel Date: Fri, 8 May 2020 23:04:44 -0400 Subject: [PATCH 3/4] Fix indent --- tools/ros2_dependencies.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index 27d7f612a2..c5412fe142 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -22,7 +22,7 @@ repositories: type: git url: https://github.com/ros-perception/vision_opencv.git version: ros2 - ompl: + ompl: type: git url: https://github.com/ros-gbp/ompl-release.git version: release/dashing/ompl/1.4.2-1 From 828fb19d63f3834b2830153ea42d7737b7f15120 Mon Sep 17 00:00:00 2001 From: Shivang Patel Date: Sat, 9 May 2020 22:17:23 -0400 Subject: [PATCH 4/4] Remove OMPL --- tools/ros2_dependencies.repos | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index c5412fe142..df9e1a177a 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -22,7 +22,3 @@ repositories: type: git url: https://github.com/ros-perception/vision_opencv.git version: ros2 - ompl: - type: git - url: https://github.com/ros-gbp/ompl-release.git - version: release/dashing/ompl/1.4.2-1