Skip to content

Commit e525e28

Browse files
GregoryLeMasurierGregoryLeMasurier
committed
Merge remote-tracking branch 'upstream/master'
2 parents 395bff6 + 287eb59 commit e525e28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+20877
-21019
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Bug report
3+
about: Help me help you...
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
If you are experiencing a crash, provide a backtrace (GDB or similar).
14+
15+
*How to Reproduce**
16+
17+
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!
18+
19+
Even better, create a Pull Request with a failing unit test.

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is.
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎CHANGELOG.rst

+31
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,37 @@
22
Changelog for package behaviortree_cpp
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.6.0 (2024-04-28)
6+
------------------
7+
* add tutorial 19 about the global blackboard
8+
* renamed examples to match website
9+
* Update TestNode and the corresponding tutorial
10+
* bug fixes related to sequence_id and unit tests added
11+
* Add string concatenation operator to scripting (`#802 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/802>`_)
12+
* Add library alias for BT::behaviortree_cpp (`#808 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/808>`_)
13+
* add Time Stamped blackboard (`#805 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/805>`_)
14+
* add additional information and functionality to SQLiteLogger
15+
* add syntax for entries in the root blackboard ("@" prefix)
16+
* Fix/pixi build (`#791 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/791>`_)
17+
* fix unit tests in Windows
18+
* fix windows compilation
19+
* Update cmake_windows.yml
20+
* Deprecate Balckboard::clear(). Issue `#794 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/794>`_
21+
* Support string vector conversion for ports (`#790 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/790>`_)
22+
* add more convertToString for integers
23+
* warn about overwritten enums
24+
* fix ambiguous to_json
25+
* Extend unit test for blackboard backup to run the second tree (`#789 <https://github.com/BehaviorTree/BehaviorTree.CPP/issues/789>`_)
26+
* json convertion changed and
27+
* 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>`_)
28+
* Update switch_node.h
29+
* test moved and port remapping fixed
30+
* Create pull_request_template.md
31+
32+
* adding pre-commit
33+
* handle enums conversions is assignment
34+
* Contributors: Davide Faconti, Sean Geles, Sebastian Castro, Victor Massagué Respall, avikus-seonghyeon.kwon, tony-p
35+
536
4.5.2 (2024-03-07)
637
------------------
738
* bugfix: string to enum/integer/boolean in scripts

‎CMakeLists.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16.3) # version on Ubuntu Focal
22

3-
project(behaviortree_cpp VERSION 4.5.2 LANGUAGES C CXX)
3+
project(behaviortree_cpp VERSION 4.6.0 LANGUAGES C CXX)
44

55
set(CMAKE_CONFIG_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
66
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CONFIG_PATH}")
@@ -99,15 +99,15 @@ list(APPEND BT_SOURCE
9999

100100
src/actions/test_node.cpp
101101
src/actions/sleep_node.cpp
102+
src/actions/updated_action.cpp
102103

103104
src/decorators/delay_node.cpp
104105
src/decorators/inverter_node.cpp
105106
src/decorators/repeat_node.cpp
106107
src/decorators/retry_node.cpp
107-
src/decorators/timeout_node.cpp
108-
src/decorators/skip_unless_updated.cpp
109108
src/decorators/subtree_node.cpp
110-
src/decorators/wait_update.cpp
109+
src/decorators/timeout_node.cpp
110+
src/decorators/updated_decorator.cpp
111111

112112
src/controls/if_then_else_node.cpp
113113
src/controls/fallback_node.cpp
@@ -190,6 +190,8 @@ else()
190190
target_compile_options(${BTCPP_LIBRARY} PRIVATE -Wall -Wextra)
191191
endif()
192192

193+
add_library(BT::${BTCPP_LIBRARY} ALIAS ${BTCPP_LIBRARY})
194+
193195
#############################################################
194196
message( STATUS "BTCPP_LIB_DESTINATION: ${BTCPP_LIB_DESTINATION} " )
195197
message( STATUS "BTCPP_INCLUDE_DESTINATION: ${BTCPP_INCLUDE_DESTINATION} " )

‎README.md

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
![License MIT](https://img.shields.io/github/license/BehaviorTree/BehaviorTree.CPP?color=blue)
2-
![Version](https://img.shields.io/badge/version-4.5-blue.svg)
2+
![Version](https://img.shields.io/badge/version-4.6-blue.svg)
33
[![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)
44
[![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)
55
[![ros1](https://github.com/BehaviorTree/BehaviorTree.CPP/workflows/ros1/badge.svg?branch=master)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions?query=workflow%3Aros1)
66
[![ros2](https://github.com/BehaviorTree/BehaviorTree.CPP/workflows/ros2/badge.svg?branch=master)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions?query=workflow%3Aros2)
77
[![pixi (Conda)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/pixi.yaml/badge.svg)](https://github.com/BehaviorTree/BehaviorTree.CPP/actions/workflows/pixi.yaml)
88

9-
# BehaviorTree.CPP 4.5
9+
# BehaviorTree.CPP 4.6
1010

1111
<p align="center"><img width=350 src="animated.svg"></p>
1212

@@ -40,14 +40,6 @@ You can learn about the main concepts, the API and the tutorials here: https://w
4040
If the documentation doesn't answer your questions and/or you want to
4141
connect with the other **BT.CPP** users, visit [our forum](https://github.com/BehaviorTree/BehaviorTree.CPP/discussions)
4242

43-
## Previous version
44-
45-
Version 3.8 of the software can be found in the branch
46-
[v3.8](https://github.com/BehaviorTree/BehaviorTree.CPP/tree/v3.8).
47-
48-
That branch might receive bug fixes, but the new features will be implemented
49-
only in the master branch.
50-
5143
# GUI Editor
5244

5345
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
10597

10698
[![Star History Chart](https://api.star-history.com/svg?repos=BehaviorTree/BehaviorTree.CPP&type=Date)](https://star-history.com/#BehaviorTree/BehaviorTree.CPP&Date)
10799

100+
## Previous version
101+
102+
Version 3.8 of the software can be found in the branch
103+
[v3.8](https://github.com/BehaviorTree/BehaviorTree.CPP/tree/v3.8).
104+
105+
That branch might receive bug fixes, but the new features will be implemented
106+
only in the master branch.
108107

109108
# License
110109

‎examples/CMakeLists.txt

+24-15
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,37 @@ CompileExample("t07_load_multiple_xml")
2626
CompileExample("t08_additional_node_args")
2727
CompileExample("t09_scripting")
2828
CompileExample("t10_observer")
29-
CompileExample("t11_replace_rules")
3029

31-
if(BTCPP_GROOT_INTERFACE AND BTCPP_SQLITE_LOGGING)
32-
CompileExample("t12_groot_howto")
33-
CompileExample("generate_log")
30+
if(BTCPP_GROOT_INTERFACE)
31+
CompileExample("t11_groot_howto")
3432
endif()
3533

34+
CompileExample("t12_default_ports")
35+
CompileExample("t13_access_by_ref")
36+
CompileExample("t14_subtree_model")
37+
CompileExample("t15_nodes_mocking")
38+
CompileExample("t16_global_blackboard")
39+
CompileExample("t17_blackboard_backup")
40+
CompileExample("t18_waypoints")
41+
3642
CompileExample("ex01_wrap_legacy")
3743
CompileExample("ex02_runtime_ports")
38-
CompileExample("ex04_waypoints")
39-
CompileExample("ex05_subtree_model")
40-
CompileExample("ex06_access_by_ptr")
41-
CompileExample("ex07_blackboard_backup")
4244

43-
CompileExample("t13_plugin_executor")
45+
if(BTCPP_SQLITE_LOGGING)
46+
CompileExample("ex03_sqlite_log")
47+
endif()
48+
49+
50+
############ Create plugin and executor in folder plugin_example ##########
4451

45-
############ Create plugin for tutorial 13 ##########
4652
# library must be SHARED
47-
add_library(t13_plugin_action SHARED t13_plugin_action.cpp )
53+
add_library(test_plugin_action SHARED plugin_example/plugin_action.cpp )
4854
# you must set the definition BT_PLUGIN_EXPORT
49-
target_compile_definitions(t13_plugin_action PRIVATE BT_PLUGIN_EXPORT )
50-
# remove the "lib" prefix. Name of the file will be t13_plugin_action.so
51-
set_target_properties(t13_plugin_action PROPERTIES PREFIX "")
55+
target_compile_definitions(test_plugin_action PRIVATE BT_PLUGIN_EXPORT )
56+
# remove the "lib" prefix. Name of the file will be test_plugin_action.so
57+
set_target_properties(test_plugin_action PROPERTIES PREFIX "")
5258
# link dependencies as usual
53-
target_link_libraries(t13_plugin_action ${BTCPP_LIBRARY} )
59+
target_link_libraries(test_plugin_action ${BTCPP_LIBRARY} )
60+
61+
add_executable(test_plugin_executor plugin_example/plugin_executor.cpp )
62+
target_link_libraries(test_plugin_executor ${BTCPP_LIBRARY})

‎examples/broken_sequence.cpp

-82
This file was deleted.

0 commit comments

Comments
 (0)