Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 26, 2025

When specifying higher-order splines while no velocity or acceleration state interfaces are configured for the robot, the controller attempted to read from the non-existing interfaces. This PR adds a check whether those interfaces are actually configured before attempting to read from them.


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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Mar 26, 2025
@mergify
Copy link
Author

mergify bot commented Mar 26, 2025

Cherry-pick of 65679b2 has failed:

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

You are currently cherry-picking commit 65679b2.
  (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:   ur_robot_driver/test/robot_driver.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_controllers/src/passthrough_trajectory_controller.cpp

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

…1314)

* passthrough_trajectory: Add a test with a full quintic trajectory

* Check for state interfaces being present before attempting to read from it
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1314 branch from d8dcfd8 to 0c67025 Compare March 28, 2025 11:46
@urfeex urfeex removed the conflicts label Mar 28, 2025
@urfeex urfeex merged commit d410371 into humble Mar 28, 2025
6 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1314 branch March 28, 2025 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants