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

[ros2_control_node] Handle simulation environment clocks (backport #1810) #1863

Merged
merged 4 commits into from
Nov 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 7, 2024

As there are many ongoing issues that people are trying to use the ros2_control_node for the simulation environments and as it is not working, I wanted to see if this solution is something that we are interesting to go with or we simple reject the possibility

Related to : #859


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

(cherry picked from commit d714e8b)

# Conflicts:
#	doc/release_notes.rst
Copy link
Contributor Author

mergify bot commented Nov 7, 2024

Cherry-pick of d714e8b has failed:

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

You are currently cherry-picking commit d714e8b.
  (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)

Changes to be committed:
	modified:   controller_manager/src/ros2_control_node.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/release_notes.rst

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 mergify bot added the conflicts label Nov 7, 2024
bmagyar
bmagyar previously approved these changes Nov 7, 2024
saikishor
saikishor previously approved these changes Nov 7, 2024
@christophfroehlich christophfroehlich marked this pull request as draft November 8, 2024 08:25
@saikishor saikishor dismissed stale reviews from bmagyar and themself via f1004d1 November 8, 2024 10:39
@saikishor saikishor marked this pull request as ready for review November 8, 2024 11:02
Copy link

codecov bot commented Nov 8, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 62.93%. Comparing base (e58c6c6) to head (010d95f).
Report is 1 commits behind head on iron.

Files with missing lines Patch % Lines
controller_manager/src/ros2_control_node.cpp 60.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #1863      +/-   ##
==========================================
- Coverage   62.93%   62.93%   -0.01%     
==========================================
  Files         113      113              
  Lines       13254    13257       +3     
  Branches     8968     8968              
==========================================
+ Hits         8342     8343       +1     
- Misses        900      901       +1     
- Partials     4012     4013       +1     
Flag Coverage Δ
unittests 62.93% <60.00%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
controller_manager/src/ros2_control_node.cpp 66.66% <60.00%> (-2.23%) ⬇️

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

Includes #1864

@christophfroehlich christophfroehlich merged commit 1dcf13f into iron Nov 10, 2024
8 of 12 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-1810 branch November 10, 2024 19:24
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