Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding disengagement threshold to rotation shim controller (backport #4699) #4702

Merged
merged 2 commits into from
Oct 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2024

#4690

@sandeepdutta please review! I updated the default for my parameter to be half of the threshold (22.5) instead of a third (15), but you can change that in your own config file if you prefer that behavior.

For the backport, I'll have to make the default 45 degrees so we don't change the default behavior, but you can again set it to 1/3 (or otherwise) in your configuration file to change that behavior for your application on Humble


This is an automatic backport of pull request #4699 done by Mergify.

* adding disengagement threshold to rotation shim controller

Signed-off-by: Steve Macenski <[email protected]>

* change default to 22.5 deg

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
(cherry picked from commit fc7e086)
Copy link
Contributor Author

mergify bot commented Oct 2, 2024

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

@SteveMacenski SteveMacenski merged commit c280e3c into humble Oct 2, 2024
1 of 3 checks passed
@SteveMacenski SteveMacenski deleted the mergify/bp/humble/pr-4699 branch October 2, 2024 18:29
RBT22 pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Nov 11, 2024
…os-navigation#4699) (ros-navigation#4702)

* Adding disengagement threshold to rotation shim controller (ros-navigation#4699)

* adding disengagement threshold to rotation shim controller

Signed-off-by: Steve Macenski <[email protected]>

* change default to 22.5 deg

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
(cherry picked from commit fc7e086)

* Update nav2_rotation_shim_controller/src/nav2_rotation_shim_controller.cpp

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>
emilnovak pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Nov 12, 2024
* Adding disengagement threshold to rotation shim controller (backport ros-navigation#4699) (ros-navigation#4702)

* Adding disengagement threshold to rotation shim controller (ros-navigation#4699)

* adding disengagement threshold to rotation shim controller

Signed-off-by: Steve Macenski <[email protected]>

* change default to 22.5 deg

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
(cherry picked from commit fc7e086)

* Update nav2_rotation_shim_controller/src/nav2_rotation_shim_controller.cpp

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* fix(nav2_theta_star_planner) Fix crash on Humble when goal is outside map bounds (ros-navigation#4706)

* Humble sync 13: Nov 8, 2024 (ros-navigation#4748)

* [DWB] Option to limit velocity commands in trajectory generator (ros-navigation#4663)

* Option to limit vel cmd through traj generator

Signed-off-by: huiyulhy <[email protected]>

* Cleanup

Signed-off-by: huiyulhy <[email protected]>

* fix linting

Signed-off-by: huiyulhy <[email protected]>

* Update linting

Signed-off-by: huiyulhy <[email protected]>

* uncrustify

Signed-off-by: huiyulhy <[email protected]>

* uncrustify

Signed-off-by: huiyulhy <[email protected]>

---------

Signed-off-by: huiyulhy <[email protected]>

* fix to bt action server logging before bt execution result being ready (ros-navigation#4677)

Signed-off-by: DreamWest <[email protected]>

* fix(simple-action-server): info log instead of warn on cancel (ros-navigation#4684)

Cancelling a goal is nominal behavior and therefore it should not log
warning.

Signed-off-by: Rein Appeldoorn <[email protected]>

* [RotationShimController] fix: rotate to goal heading (ros-navigation#4724)

Add frame_id to goal when rotating towards goal heading, otherwise the
transform would fail. This bug was introduced in 30e2cde by not setting
the frame_id.

Signed-off-by: agennart <[email protected]>
Co-authored-by: agennart <[email protected]>

* Fix incorrect doxygen comment (ros-navigation#4741)

Signed-off-by: Ryan Friedman <[email protected]>

* [map_io] Replace std logs by rclcpp logs (ros-navigation#4720)

* replace std logs by rclcpp logs

Signed-off-by: Guillaume Doisy <[email protected]>

* RCLCPP_DEBUG to RCLCPP_INFO for visibility

Signed-off-by: Guillaume Doisy <[email protected]>

---------

Signed-off-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>

* bump to 1.1.17 for humble sync

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: huiyulhy <[email protected]>
Signed-off-by: DreamWest <[email protected]>
Signed-off-by: Rein Appeldoorn <[email protected]>
Signed-off-by: agennart <[email protected]>
Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Guillaume Doisy <[email protected]>
Signed-off-by: Steve Macenski <[email protected]>
Co-authored-by: Huiyu Leong <[email protected]>
Co-authored-by: DreamWest <[email protected]>
Co-authored-by: Rein Appeldoorn <[email protected]>
Co-authored-by: Saitama <[email protected]>
Co-authored-by: agennart <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
Signed-off-by: huiyulhy <[email protected]>
Signed-off-by: DreamWest <[email protected]>
Signed-off-by: Rein Appeldoorn <[email protected]>
Signed-off-by: agennart <[email protected]>
Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Guillaume Doisy <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Steve Macenski <[email protected]>
Co-authored-by: brayanpa <[email protected]>
Co-authored-by: Huiyu Leong <[email protected]>
Co-authored-by: DreamWest <[email protected]>
Co-authored-by: Rein Appeldoorn <[email protected]>
Co-authored-by: Saitama <[email protected]>
Co-authored-by: agennart <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant