Skip to content

Enforce singularity threshold when moving away from a singularity (backport #620)#1649

Merged
tylerjw merged 1 commit intohumblefrom
mergify/bp/humble/pr-620
Oct 28, 2022
Merged

Enforce singularity threshold when moving away from a singularity (backport #620)#1649
tylerjw merged 1 commit intohumblefrom
mergify/bp/humble/pr-620

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Oct 28, 2022

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Enforce singularity threshold behavior even when moving away from a singularity

- Prevent uncontrolled behavior when servo starts close to a singularity and then servos away from it
- Scale velocity at a different rate when approaching/leaving singularity
- Add status code to distinguish between velocity scaling when moving towards/away from the singularity

* Work on expanding servo singularity tests

* Pre-commit

* removed duplicate input checking

* added 2 other tests

* undid changes to singularity test

* Update moveit_ros/moveit_servo/src/servo_calcs.cpp with Nathan's suggestion

Co-authored-by: Nathan Brooks <nbbrooks@gmail.com>

* readability changes and additional servo parameter check

* updating to newest design

* added warning message

* added missing semicolon

* made optional parameter nicer

* Remove outdated warning

Co-authored-by: AndyZe <andyz@utexas.edu>

* Removing inaccurate comment

Co-authored-by: AndyZe <andyz@utexas.edu>

* making Andy's suggested changes, added some comments and defaults, moved code block next to relevant singularity code

* removed part of comment that does not apply any more

* Mention "deprecation" in the warning

Co-authored-by: Henry Moore <henrygerardmoore@gmail.com>
Co-authored-by: Henry Moore <44307180+henrygerardmoore@users.noreply.github.com>
Co-authored-by: AndyZe <zelenak@picknik.ai>
Co-authored-by: AndyZe <andyz@utexas.edu>
(cherry picked from commit d4b3294)
@codecov
Copy link
Copy Markdown

codecov bot commented Oct 28, 2022

Codecov Report

Base: 51.03% // Head: 51.03% // Increases project coverage by +0.01% 🎉

Coverage data is based on head (e7221ed) compared to base (7d64eae).
Patch coverage: 87.88% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1649      +/-   ##
==========================================
+ Coverage   51.03%   51.03%   +0.01%     
==========================================
  Files         381      381              
  Lines       31787    31805      +18     
==========================================
+ Hits        16218    16228      +10     
- Misses      15569    15577       +8     
Impacted Files Coverage Δ
...veit_servo/include/moveit_servo/servo_parameters.h 100.00% <ø> (ø)
moveit_ros/moveit_servo/src/servo_parameters.cpp 86.53% <71.43%> (-0.78%) ⬇️
moveit_ros/moveit_servo/src/servo_calcs.cpp 68.26% <100.00%> (+0.82%) ⬆️
...dl_kinematics_plugin/src/kdl_kinematics_plugin.cpp 75.36% <0.00%> (-1.07%) ⬇️
...nning_scene_monitor/src/planning_scene_monitor.cpp 45.29% <0.00%> (-0.43%) ⬇️
moveit_core/robot_state/src/robot_state.cpp 47.37% <0.00%> (-0.07%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tylerjw tylerjw merged commit ad39107 into humble Oct 28, 2022
@tylerjw tylerjw deleted the mergify/bp/humble/pr-620 branch October 28, 2022 20:48
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.

2 participants