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

Update current state even if servo is paused (backport #3341) #3347

Merged
merged 2 commits into from
Feb 15, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 15, 2025

Description

Servo was not updating the current robot state when it was paused. This can result in massive jumps when servo is paused and the robot is moved with another mechanism, then servo is reactivated.


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

Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit 50b4337)

# Conflicts:
#	moveit_ros/moveit_servo/src/servo_node.cpp
@mergify mergify bot added the conflicts label Feb 15, 2025
Copy link
Author

mergify bot commented Feb 15, 2025

Cherry-pick of 50b4337 has failed:

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

You are currently cherry-picking commit 50b433768.
  (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:   moveit_ros/moveit_servo/src/servo_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

@codecov-commenter
Copy link

codecov-commenter commented Feb 15, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 44.40%. Comparing base (6da4b25) to head (be86c31).
Report is 1 commits behind head on jazzy.

Files with missing lines Patch % Lines
moveit_ros/moveit_servo/src/servo_node.cpp 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##            jazzy    #3347      +/-   ##
==========================================
+ Coverage   44.40%   44.40%   +0.01%     
==========================================
  Files         701      701              
  Lines       61863    61864       +1     
  Branches     7494     7494              
==========================================
+ Hits        27464    27467       +3     
+ Misses      34231    34229       -2     
  Partials      168      168              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass sea-bass merged commit adce056 into jazzy Feb 15, 2025
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/jazzy/pr-3341 branch February 15, 2025 10:09
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.

3 participants