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

[JTC] Cancel active goal in on_deactivate #962

Merged

Conversation

christophfroehlich
Copy link
Contributor

Currently, an active goal is not cancelled if on_deactivate is called. This PR changes this behavior now.

I also removed an unnecessary set_hold_position() call in the preempt_active_goal.

@christophfroehlich christophfroehlich added backport-humble This label should be used by maintainers only! Label triggers PR backport to ROS2 humble. backport-iron labels Jan 4, 2024
@christophfroehlich christophfroehlich force-pushed the jtc/cancel_goal_deactivate branch from 1fa82db to 6d12abf Compare January 4, 2024 13:16
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!
LGTM once the CI passes

Copy link

codecov bot commented Jan 4, 2024

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (2b52f0b) 47.82% compared to head (6d12abf) 47.22%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #962      +/-   ##
==========================================
- Coverage   47.82%   47.22%   -0.61%     
==========================================
  Files          41       41              
  Lines        3862     3871       +9     
  Branches     1816     1827      +11     
==========================================
- Hits         1847     1828      -19     
- Misses        754      775      +21     
- Partials     1261     1268       +7     
Flag Coverage Δ
unittests 47.22% <0.00%> (-0.61%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...ory_controller/src/joint_trajectory_controller.cpp 47.40% <0.00%> (-1.15%) ⬇️

... and 3 files with indirect coverage changes

Copy link
Member

@bmagyar bmagyar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@bmagyar bmagyar merged commit fdd6142 into ros-controls:master Jan 11, 2024
13 of 14 checks passed
mergify bot pushed a commit that referenced this pull request Jan 11, 2024
mergify bot pushed a commit that referenced this pull request Jan 11, 2024
@christophfroehlich christophfroehlich deleted the jtc/cancel_goal_deactivate branch January 11, 2024 14:49
bmagyar pushed a commit that referenced this pull request Jan 11, 2024
bmagyar pushed a commit that referenced this pull request Jan 11, 2024
henrygerardmoore pushed a commit to henrygerardmoore/ros2_controllers that referenced this pull request Jul 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-humble This label should be used by maintainers only! Label triggers PR backport to ROS2 humble.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants