Skip to content

ROS Parameter for service call timeout for ros_control controllers (backport #3419) #3432

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

Merged
merged 3 commits into from
May 1, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 12, 2025

Description

Added a new ROS parameter controller_service_call_timeout for the ROS control interface managers, which can be specified in the moveit_controller yaml configuration file. I have tested it out using the https://github.com/moveit/moveit_resources/tree/ros2/dual_arm_panda_moveit_config example moveit configuration by trying out the following values for the parameter in the moveit_controllers.yaml:

controller_service_call_timeout: 0.00001 : Controllers did not connect
controller_service_call_timeout: 1.0 : Controllers connected and path planning could be executed

Closes issue #3405

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3419 done by [Mergify](https://mergify.com).

…3419)

(cherry picked from commit 64e934f)

# Conflicts:
#	moveit_plugins/moveit_ros_control_interface/README.md
#	moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.cpp
@mergify mergify bot added the conflicts label Apr 12, 2025
Copy link
Author

mergify bot commented Apr 12, 2025

Cherry-pick of 64e934f has failed:

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

You are currently cherry-picking commit 64e934ff4.
  (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_plugins/moveit_ros_control_interface/README.md
	both modified:   moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.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

@sea-bass
Copy link
Contributor

@ashwinsnambiar if you would like to resolve these conflicts for a Humble backport, it would be appreciated. It also doesn't really need a backport, though, so up to you!

@ashwinsnambiar
Copy link
Contributor

Sorry for getting back late. I have made the necessary changes for the backport. Shall I create a new PR for that? @sea-bass

@sea-bass
Copy link
Contributor

I have made necessary changes for the backport. Shall I create a new PR for that? @sea-bass

Yes -- easiest thing would be to just make a PR that targets this branch with the fixes. Else, a new PR altogether targeting Humble is fine too.

@ashwinsnambiar ashwinsnambiar mentioned this pull request May 1, 2025
6 tasks
@ashwinsnambiar
Copy link
Contributor

I have made a new PR #3458 targeting this branch with the fixes.

* resolve merge conflicts for humble backport

* auto-format using clang-format
@sea-bass sea-bass removed the conflicts label May 1, 2025
Copy link
Contributor

@sea-bass sea-bass left a comment

Choose a reason for hiding this comment

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

Thanks @ashwinsnambiar !

Copy link

codecov bot commented May 1, 2025

Codecov Report

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

Project coverage is 50.95%. Comparing base (85dd2cf) to head (8e22ed4).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
...ontrol_interface/src/controller_manager_plugin.cpp 88.89% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3432      +/-   ##
==========================================
+ Coverage   50.94%   50.95%   +0.01%     
==========================================
  Files         390      390              
  Lines       32512    32520       +8     
==========================================
+ Hits        16560    16566       +6     
- Misses      15952    15954       +2     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sea-bass sea-bass merged commit a60ed9f into humble May 1, 2025
8 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3419 branch May 1, 2025 12:18
@github-project-automation github-project-automation bot moved this to ✅ Done in MoveIt May 1, 2025
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