diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/behavior_tree_engine.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/behavior_tree_engine.hpp index 31e0b530ae9a10ae1c473a5f5ffb68f5aab84936..6d222c301b74020478d22f57842a2d6ca6c6cf80 100644 --- a/nav2_behavior_tree/include/nav2_behavior_tree/behavior_tree_engine.hpp +++ b/nav2_behavior_tree/include/nav2_behavior_tree/behavior_tree_engine.hpp @@ -33,13 +33,6 @@ public: BehaviorTreeEngine(); virtual ~BehaviorTreeEngine() {} - BtStatus run( - BT::Blackboard::Ptr & blackboard, - const std::string & behavior_tree_xml, - std::function<void()> onLoop, - std::function<bool()> cancelRequested, - std::chrono::milliseconds loopTimeout = std::chrono::milliseconds(10)); - BtStatus run( std::unique_ptr<BT::Tree> & tree, std::function<void()> onLoop, diff --git a/nav2_behavior_tree/src/behavior_tree_engine.cpp b/nav2_behavior_tree/src/behavior_tree_engine.cpp index bd38d54e72009018e66f0e74d63d904e1d80e5d0..9e905a653d9aaf8c33730fd73907845c50e0625a 100644 --- a/nav2_behavior_tree/src/behavior_tree_engine.cpp +++ b/nav2_behavior_tree/src/behavior_tree_engine.cpp @@ -63,37 +63,6 @@ BehaviorTreeEngine::BehaviorTreeEngine() factory_.registerNodeType<nav2_behavior_tree::RecoveryNode>("RecoveryNode"); } -BtStatus -BehaviorTreeEngine::run( - BT::Blackboard::Ptr & blackboard, - const std::string & behavior_tree_xml, - std::function<void()> onLoop, - std::function<bool()> cancelRequested, - std::chrono::milliseconds loopTimeout) -{ - // Parse the input XML and create the corresponding Behavior Tree - BT::Tree tree = buildTreeFromText(behavior_tree_xml, blackboard); - - rclcpp::WallRate loopRate(loopTimeout); - BT::NodeStatus result = BT::NodeStatus::RUNNING; - - // Loop until something happens with ROS or the node completes - while (rclcpp::ok() && result == BT::NodeStatus::RUNNING) { - if (cancelRequested()) { - tree.root_node->halt(); - return BtStatus::CANCELED; - } - - onLoop(); - - result = tree.root_node->executeTick(); - - loopRate.sleep(); - } - - return (result == BT::NodeStatus::SUCCESS) ? BtStatus::SUCCEEDED : BtStatus::FAILED; -} - BtStatus BehaviorTreeEngine::run( std::unique_ptr<BT::Tree> & tree,