From 3439592b6a990731d9790ecff5026c7c41fa0411 Mon Sep 17 00:00:00 2001
From: Tobit Flatscher <53856473+2b-t@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:41:29 +0000
Subject: [PATCH] feat: Port to BehaviorTree.CPP v4

---
 CMakeLists.txt                                   | 4 ++--
 include/behaviortree_ros/bt_action_node.h        | 4 ++--
 include/behaviortree_ros/bt_service_node.h       | 4 ++--
 include/behaviortree_ros/loggers/rosout_logger.h | 2 +-
 package.xml                                      | 4 ++--
 test/test_bt.cpp                                 | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9805048..0b7eb67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5.1) # version on Ubuntu Trusty
 project(behaviortree_ros)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -9,7 +9,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set(ROS_DEPENDENCIES
     roscpp std_msgs
-    behaviortree_cpp_v3
+    behaviortree_cpp
     actionlib_msgs
     actionlib
     message_generation)
diff --git a/include/behaviortree_ros/bt_action_node.h b/include/behaviortree_ros/bt_action_node.h
index a8c21bb..fb6ab0e 100644
--- a/include/behaviortree_ros/bt_action_node.h
+++ b/include/behaviortree_ros/bt_action_node.h
@@ -16,8 +16,8 @@
 #ifndef BEHAVIOR_TREE_BT_ACTION_NODE_HPP_
 #define BEHAVIOR_TREE_BT_ACTION_NODE_HPP_
 
-#include <behaviortree_cpp_v3/action_node.h>
-#include <behaviortree_cpp_v3/bt_factory.h>
+#include <behaviortree_cpp/action_node.h>
+#include <behaviortree_cpp/bt_factory.h>
 #include <ros/ros.h>
 #include <actionlib/client/simple_action_client.h>
 
diff --git a/include/behaviortree_ros/bt_service_node.h b/include/behaviortree_ros/bt_service_node.h
index a60eff6..e3120f2 100644
--- a/include/behaviortree_ros/bt_service_node.h
+++ b/include/behaviortree_ros/bt_service_node.h
@@ -16,8 +16,8 @@
 #ifndef BEHAVIOR_TREE_BT_SERVICE_NODE_HPP_
 #define BEHAVIOR_TREE_BT_SERVICE_NODE_HPP_
 
-#include <behaviortree_cpp_v3/action_node.h>
-#include <behaviortree_cpp_v3/bt_factory.h>
+#include <behaviortree_cpp/action_node.h>
+#include <behaviortree_cpp/bt_factory.h>
 #include <ros/ros.h>
 #include <ros/service_client.h>
 
diff --git a/include/behaviortree_ros/loggers/rosout_logger.h b/include/behaviortree_ros/loggers/rosout_logger.h
index f79cd2b..47b21e6 100644
--- a/include/behaviortree_ros/loggers/rosout_logger.h
+++ b/include/behaviortree_ros/loggers/rosout_logger.h
@@ -1,7 +1,7 @@
 #ifndef BT_ROSOUT_LOGGER_H
 #define BT_ROSOUT_LOGGER_H
 
-#include <behaviortree_cpp_v3/loggers/abstract_logger.h>
+#include <behaviortree_cpp/loggers/abstract_logger.h>
 #include <ros/console.h>
 
 namespace BT
diff --git a/package.xml b/package.xml
index e97b070..96fc6aa 100644
--- a/package.xml
+++ b/package.xml
@@ -13,13 +13,13 @@
 
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
-  <build_depend>behaviortree_cpp_v3</build_depend>
+  <build_depend>behaviortree_cpp</build_depend>
   <build_depend>actionlib</build_depend>
   <build_depend>actionlib_msgs</build_depend>
   
   <run_depend>roscpp</run_depend>
   <run_depend>std_msgs</run_depend>
-  <run_depend>behaviortree_cpp_v3</run_depend>
+  <run_depend>behaviortree_cpp</run_depend>
   <run_depend>actionlib</run_depend>
   <run_depend>actionlib_msgs</run_depend>
 
diff --git a/test/test_bt.cpp b/test/test_bt.cpp
index 7b5070d..246a350 100644
--- a/test/test_bt.cpp
+++ b/test/test_bt.cpp
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
   while( ros::ok() && (status == NodeStatus::IDLE || status == NodeStatus::RUNNING))
   {
     ros::spinOnce();
-    status = tree.tickRoot();
+    status = tree.tickOnce();
     std::cout << status << std::endl;
     ros::Duration sleep_time(0.01);
     sleep_time.sleep();