Skip to content

Commit e90150b

Browse files
authored
Update deprecated syntax from BTv3 (#642)
* Update deprecated syntax from BTv3 Signed-off-by: Maurice-1235 <[email protected]> * Revert in out port Signed-off-by: Maurice-1235 <[email protected]> * Update BT img Signed-off-by: Maurice-1235 <[email protected]> * Fix typo Signed-off-by: Maurice-1235 <[email protected]> --------- Signed-off-by: Maurice-1235 <[email protected]>
1 parent af5636f commit e90150b

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
_build
22
lib/
33
bin/
4-
pyvenv.cfg
4+
pyvenv.cfg
5+
.DS_Store
24.1 KB
Loading

behavior_trees/overview/detailed_behavior_tree_walkthrough.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Prerequisites
2626

2727
- Read the short explanation in `navigation concepts <../../concepts/index.html>`_
2828

29-
- Read the general tutorial and guide (not Nav2 specific) on the `BehaviorTree CPP V3 <https://www.behaviortree.dev/>`_ website. Specifically, the "Learn the Basics" section on the BehaviorTree CPP V3 website explains the basic generic nodes that will be used that this guide will build upon.
29+
- Read the general tutorial and guide (not Nav2 specific) on the `BehaviorTree CPP V4 <https://www.behaviortree.dev/>`_ website. Specifically, the "Basic Concepts" section on the BehaviorTree CPP V4 website explains the basic generic nodes that will be used that this guide will build upon.
3030

3131
- Become familiar with the custom `Nav2 specific BT nodes <nav2_specific_nodes.html>`_
3232

behavior_trees/trees/nav_to_pose_and_pause_near_goal_obstacle.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Navigate To Pose and Pause Near Goal-Obstacle
22
#############################################
33

4-
.. note:: As a prerequisite, we encourage the users to go through the `Behavior Tree documentation <https://behaviortree.github.io/BehaviorTree.CPP/>`_, which explains about different behaviors nodes used in these trees such as ``ReactiveSequence``, ``SequenceStar`` and ``RetryUntilSucessfull``.
4+
.. note:: As a prerequisite, we encourage the users to go through the `Behavior Tree documentation <https://behaviortree.github.io/BehaviorTree.CPP/>`_, which explains about different behaviors nodes used in these trees such as ``ReactiveSequence``, ``SequenceWithMemory`` and ``RetryUntilSuccessful``.
55

66
This behavior tree is a soft extension to the :ref:`behavior_tree_nav_to_pose`.
77
Apart from the functionalities of :ref:`behavior_tree_nav_to_pose`, this behavior tree allows the robot to efficiently handle an obstacle (e.g. forklift, person, or other temporary obstacles) close to the goal by pausing the robot's navigation and wait for a user-specified time to check if the obstacle has cleared.
@@ -16,9 +16,9 @@ If there is no significantly longer path, the monitor node goes into the ``Follo
1616
.. image:: ../images/walkthrough/patience_and_recovery.png
1717

1818
Once there is a significantly longer path, the child node for the ``PathLongerOnApproach`` node ticks.
19-
The child node is a ``RetryUntilSuccesfull`` decorator node, which inturns have a ``SequenceStar`` node as its child.
20-
Firstly, the ``SequenceStar`` node cancels the controller server by ticking the ``CancelControl`` node. The cancellation of the controller server halts the further navigation of the robot.
21-
Next, the ``SequenceStar`` node ticks the ``Wait`` node, which enables the robot to wait for the given user-specified time.
19+
The child node is a ``RetryUntilSuccesful`` decorator node, which inturns have a ``SequenceWithMemory`` node as its child.
20+
Firstly, the ``SequenceWithMemory`` node cancels the controller server by ticking the ``CancelControl`` node. The cancellation of the controller server halts the further navigation of the robot.
21+
Next, the ``SequenceWithMemory`` node ticks the ``Wait`` node, which enables the robot to wait for the given user-specified time.
2222
Here we need to note that, the ``MonitorAndFollowPath`` is a ``ReactiveSequence`` node, therefore the ``PathLongerOnApproach`` node needs to return SUCCESS, before the ``FollowPath`` node can be ticked once again.
2323

2424
In the below GIF, it can be seen that the robot is approaching the goal location, but it found an obstacle in the goal proximity, because of which the global planner, plans a longer path around.
@@ -53,10 +53,10 @@ In conclusion, this particular BT would serve, both as an example and ready-to-u
5353
<ReactiveSequence name="MonitorAndFollowPath">
5454
<PathLongerOnApproach path="{path}" prox_len="3.0" length_factor="2.0">
5555
<RetryUntilSuccessful num_attempts="1">
56-
<SequenceStar name="CancelingControlAndWait">
56+
<SequenceWithMemory name="CancelingControlAndWait">
5757
<CancelControl name="ControlCancel"/>
5858
<Wait wait_duration="5.0"/>
59-
</SequenceStar>
59+
</SequenceWithMemory>
6060
</RetryUntilSuccessful>
6161
</PathLongerOnApproach>
6262
<RecoveryNode number_of_retries="1" name="FollowPath">

plugin_tutorials/docs/writing_new_bt_plugin.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ Select this BT XML file in your specific navigation request in ``NavigateToPose`
224224
</PipelineSequence>
225225
<ReactiveFallback name="RecoveryFallback">
226226
<GoalUpdated/>
227-
<SequenceStar name="RecoveryActions">
227+
<SequenceWithMemory name="RecoveryActions">
228228
<ClearEntireCostmap name="ClearLocalCostmap-Subtree" service_name="local_costmap/clear_entirely_local_costmap"/>
229229
<ClearEntireCostmap name="ClearGlobalCostmap-Subtree" service_name="global_costmap/clear_entirely_global_costmap"/>
230230
<Spin spin_dist="1.57"/>
231231
<Wait wait_duration="5"/>
232-
</SequenceStar>
232+
</SequenceWithMemory>
233233
</ReactiveFallback>
234234
</RecoveryNode>
235235
</BehaviorTree>

0 commit comments

Comments
 (0)