Skip to content

Add double spin_some in some BT nodes (backport #5055)#5067

Closed
mergify[bot] wants to merge 1 commit intojazzyfrom
mergify/bp/jazzy/pr-5055
Closed

Add double spin_some in some BT nodes (backport #5055)#5067
mergify[bot] wants to merge 1 commit intojazzyfrom
mergify/bp/jazzy/pr-5055

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2025

Basic Info

Info Please fill out this column
Ticket(s) this addresses #5041
Primary OS tested on Ubuntu 24.04
Robotic platform tested on Morphia robot
Does this PR contain AI generated software? Nope

Description of testing performed

Description of contribution in a few bullet points

  • Added a double spin_some in is_battery_charging_condition , is_battery_low_condition and XYZ_selector_node to temporary fix a rclcpp regression.

Description of documentation updates required from your changes

Description of how this change was tested

Future work that may be required in bullet points

For Maintainers:

  • Check that any new parameters added are updated in docs.nav2.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists
This is an automatic backport of pull request #5055 done by [Mergify](https://mergify.com).

@ajtudela @mergify
Add double spin_some in some BT nodes (#5055)
ae7d029 
* Add a double spin

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Add comment

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Move spin to constructor

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

---------

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
(cherry picked from commit 4e8469e)

# Conflicts:
#	nav2_behavior_tree/plugins/action/controller_selector_node.cpp
#	nav2_behavior_tree/plugins/action/planner_selector_node.cpp
#	nav2_behavior_tree/plugins/action/smoother_selector_node.cpp
#	nav2_behavior_tree/plugins/condition/is_battery_charging_condition.cpp
#	nav2_behavior_tree/plugins/condition/is_battery_low_condition.cpp
#	nav2_behavior_tree/plugins/decorator/goal_updater_node.cpp
@mergify mergify bot added the conflicts label Apr 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 8, 2025

Cherry-pick of 4e8469e has failed:

On branch mergify/bp/jazzy/pr-5055
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 4e8469e5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_behavior_tree/plugins/action/controller_selector_node.cpp
	both modified:   nav2_behavior_tree/plugins/action/planner_selector_node.cpp
	both modified:   nav2_behavior_tree/plugins/action/smoother_selector_node.cpp
	both modified:   nav2_behavior_tree/plugins/condition/is_battery_charging_condition.cpp
	both modified:   nav2_behavior_tree/plugins/condition/is_battery_low_condition.cpp
	both modified:   nav2_behavior_tree/plugins/decorator/goal_updater_node.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify
Copy link
Contributor Author

mergify bot commented Apr 8, 2025

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @jazzy, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski SteveMacenski deleted the mergify/bp/jazzy/pr-5055 branch April 8, 2025 15:57
@SteveMacenski SteveMacenski mentioned this pull request Apr 8, 2025
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SteveMacenski @ajtudela