Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,19 @@
+---
+name: Bug report
+about: Help me help you...
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+If you are experiencing a crash, provide a backtrace (GDB or similar).
+
+*How to Reproduce**
+
+Please provide a specific description of how to reproduce the issue or source code that can be compiled and executed. Please attach a file/project that is easy to compile, don't copy and paste code snippets!
+
+Even better, create a Pull Request with a failing unit test.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG.rst

@@ -2,6 +2,37 @@
 Changelog for package behaviortree_cpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+4.6.0 (2024-04-28)
+------------------
+* add tutorial 19 about the global blackboard
+* renamed examples to match website
+* Update TestNode and the corresponding tutorial
+* bug fixes related to sequence_id and unit tests added
+* Add string concatenation operator to scripting (`#802 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/802>`_)
+* Add library alias for BT::behaviortree_cpp (`#808 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/808>`_)
+* add Time Stamped blackboard (`#805 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/805>`_)
+* add additional information and functionality to SQLiteLogger
+* add syntax for entries in the root blackboard ("@" prefix)
+* Fix/pixi build (`#791 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/791>`_)
+* fix unit tests in Windows
+* fix windows compilation
+* Update cmake_windows.yml
+* Deprecate Balckboard::clear(). Issue `#794 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/794>`_
+* Support string vector conversion for ports (`#790 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/790>`_)
+* add more convertToString for integers
+* warn about overwritten enums
+* fix ambiguous to_json
+* Extend unit test for blackboard backup to run the second tree (`#789 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/789>`_)
+* json convertion changed and
+* issue `#755 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/755>`_ : add backchaining test and change reactive nodes checks (`#770 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/770>`_)
+* Update switch_node.h
+* test moved and port remapping fixed
+* Create pull_request_template.md
+
+* adding pre-commit
+* handle enums conversions is assignment
+* Contributors: Davide Faconti, Sean Geles, Sebastian Castro, Victor Massagué Respall, avikus-seonghyeon.kwon, tony-p
+
 4.5.2 (2024-03-07)
 ------------------
 * bugfix: string to enum/integer/boolean in scripts

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16.3) # version on Ubuntu Focal
 
-project(behaviortree_cpp VERSION 4.5.2 LANGUAGES C CXX)
+project(behaviortree_cpp VERSION 4.6.0 LANGUAGES C CXX)
 
 set(CMAKE_CONFIG_PATH ${CMAKE_MODULE_PATH}  "${CMAKE_CURRENT_LIST_DIR}/cmake")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CONFIG_PATH}")
@@ -99,15 +99,15 @@ list(APPEND BT_SOURCE
 
     src/actions/test_node.cpp
     src/actions/sleep_node.cpp
+    src/actions/updated_action.cpp
 
     src/decorators/delay_node.cpp
     src/decorators/inverter_node.cpp
     src/decorators/repeat_node.cpp
     src/decorators/retry_node.cpp
-    src/decorators/timeout_node.cpp
-    src/decorators/skip_unless_updated.cpp
     src/decorators/subtree_node.cpp
-    src/decorators/wait_update.cpp
+    src/decorators/timeout_node.cpp
+    src/decorators/updated_decorator.cpp
 
     src/controls/if_then_else_node.cpp
     src/controls/fallback_node.cpp
@@ -190,6 +190,8 @@ else()
     target_compile_options(${BTCPP_LIBRARY} PRIVATE -Wall -Wextra)
 endif()
 
+add_library(BT::${BTCPP_LIBRARY} ALIAS ${BTCPP_LIBRARY})
+
 #############################################################
 message( STATUS "BTCPP_LIB_DESTINATION:   ${BTCPP_LIB_DESTINATION} " )
 message( STATUS "BTCPP_INCLUDE_DESTINATION: ${BTCPP_INCLUDE_DESTINATION} " )

README.md

@@ -1,12 +1,12 @@
 ![License MIT](https://img.shields.io/github/license/BehaviorTree/BehaviorTree.CPP?color=blue)
-![Version](https://img.shields.io/badge/version-4.5-blue.svg)
+![Version](https://img.shields.io/badge/version-4.6-blue.svg)
 [![conan Ubuntu](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/cmake_ubuntu.yml/badge.svg)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/cmake_ubuntu.yml)
 [![conan Windows](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/cmake_windows.yml/badge.svg)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/cmake_windows.yml)
 [![ros1](https://github.com/BehaviorTree/BehaviorTree.CPP/workflows/ros1/badge.svg?branch=master)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions?query=workflow%3Aros1)
 [![ros2](https://github.com/BehaviorTree/BehaviorTree.CPP/workflows/ros2/badge.svg?branch=master)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions?query=workflow%3Aros2)
 [![pixi (Conda)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/pixi.yaml/badge.svg)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/pixi.yaml)
 
-# BehaviorTree.CPP 4.5
+# BehaviorTree.CPP 4.6
 
 <p align="center"><img width=350 src="animated.svg"></p>
 
@@ -40,14 +40,6 @@ You can learn about the main concepts, the API and the tutorials here: https://w
 If the documentation doesn't answer your questions and/or you want to
 connect with the other **BT.CPP** users, visit [our forum](https://github.com/BehaviorTree/BehaviorTree.CPP/discussions)
 
-## Previous version
-
-Version 3.8 of the software can be found in the branch
-[v3.8](https://github.com/BehaviorTree/BehaviorTree.CPP/tree/v3.8).
-
-That branch might receive bug fixes, but the new features will be implemented
-only in the master branch.
-
 # GUI Editor
 
 Editing a BehaviorTree is as simple as editing an XML file in your favorite text editor.
@@ -105,6 +97,13 @@ You can contact the primary author, **[email protected]**, to discuss y
 
 [![Star History Chart](https://api.star-history.com/svg?repos=BehaviorTree/BehaviorTree.CPP&type=Date)](https://star-history.com/#BehaviorTree/BehaviorTree.CPP&Date)
 
+## Previous version
+
+Version 3.8 of the software can be found in the branch
+[v3.8](https://github.com/BehaviorTree/BehaviorTree.CPP/tree/v3.8).
+
+That branch might receive bug fixes, but the new features will be implemented
+only in the master branch.
 
 # License
 

examples/CMakeLists.txt

@@ -26,28 +26,37 @@ CompileExample("t07_load_multiple_xml")
 CompileExample("t08_additional_node_args")
 CompileExample("t09_scripting")
 CompileExample("t10_observer")
-CompileExample("t11_replace_rules")
 
-if(BTCPP_GROOT_INTERFACE AND BTCPP_SQLITE_LOGGING)
-CompileExample("t12_groot_howto")
-CompileExample("generate_log")
+if(BTCPP_GROOT_INTERFACE)
+  CompileExample("t11_groot_howto")
 endif()
 
+CompileExample("t12_default_ports")
+CompileExample("t13_access_by_ref")
+CompileExample("t14_subtree_model")
+CompileExample("t15_nodes_mocking")
+CompileExample("t16_global_blackboard")
+CompileExample("t17_blackboard_backup")
+CompileExample("t18_waypoints")
+
 CompileExample("ex01_wrap_legacy")
 CompileExample("ex02_runtime_ports")
-CompileExample("ex04_waypoints")
-CompileExample("ex05_subtree_model")
-CompileExample("ex06_access_by_ptr")
-CompileExample("ex07_blackboard_backup")
 
-CompileExample("t13_plugin_executor")
+if(BTCPP_SQLITE_LOGGING)
+  CompileExample("ex03_sqlite_log")
+endif()
+
+
+############ Create plugin and executor in folder plugin_example ##########
 
-############ Create plugin for tutorial 13 ##########
 # library must be SHARED
-add_library(t13_plugin_action SHARED t13_plugin_action.cpp )
+add_library(test_plugin_action SHARED plugin_example/plugin_action.cpp )
 # you must set the definition BT_PLUGIN_EXPORT
-target_compile_definitions(t13_plugin_action PRIVATE  BT_PLUGIN_EXPORT )
-# remove the "lib" prefix. Name of the file will be t13_plugin_action.so
-set_target_properties(t13_plugin_action PROPERTIES PREFIX "")
+target_compile_definitions(test_plugin_action PRIVATE  BT_PLUGIN_EXPORT )
+# remove the "lib" prefix. Name of the file will be test_plugin_action.so
+set_target_properties(test_plugin_action PROPERTIES PREFIX "")
 # link dependencies as usual
-target_link_libraries(t13_plugin_action ${BTCPP_LIBRARY} )
+target_link_libraries(test_plugin_action ${BTCPP_LIBRARY} )
+
+add_executable(test_plugin_executor  plugin_example/plugin_executor.cpp )
+target_link_libraries(test_plugin_executor ${BTCPP_LIBRARY})