Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 6, 2025

Separate node for executing trajectories while also monitoring an until condition. Currently works with any motion controller, that uses the FollowJointTrajectory action, and the tool contact controller.


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

@mergify
Copy link
Author

mergify bot commented Oct 6, 2025

Cherry-pick of 92ded2d has failed:

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

You are currently cherry-picking commit 92ded2d.
  (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:
	new file:   ur_robot_driver/doc/trajectory_until_node.rst
	new file:   ur_robot_driver/examples/move_until_example.py
	new file:   ur_robot_driver/include/ur_robot_driver/trajectory_until_node.hpp
	modified:   ur_robot_driver/launch/ur_control.launch.py
	new file:   ur_robot_driver/src/trajectory_until_node.cpp
	new file:   ur_robot_driver/test/integration_test_trajectory_until.py
	modified:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/CMakeLists.txt
	both modified:   ur_robot_driver/doc/index.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 conflicts humble Relevant for humble and higher ROS versions labels Oct 6, 2025
URJala and others added 2 commits October 13, 2025 12:21
The trajectory until node allows a user to execute a trajectory with an "until" condition enabled (currently only tool contact is available) without having to call 2 actions at the same time.

(cherry picked from commit 92ded2d)

# Conflicts:
#	ur_robot_driver/CMakeLists.txt
#	ur_robot_driver/doc/index.rst
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1461 branch from b0529eb to b84d30e Compare October 13, 2025 12:26
@urfeex urfeex removed the conflicts label Oct 13, 2025
@urfeex urfeex closed this Oct 14, 2025
@urfeex urfeex reopened this Oct 14, 2025
@urfeex urfeex merged commit ee5e57b into humble Oct 17, 2025
6 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1461 branch October 17, 2025 13:51
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