Skip to content

Check payload state in gpio_controller (backport #1770)#1775

Open
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-1770
Open

Check payload state in gpio_controller (backport #1770)#1775
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-1770

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Apr 29, 2026

Before, we were returning success, as soon as the hardware interface attempted to setup the payload.

This change reads the payload information from the robot and only returns success if the read payload matches with what the user requested.

Note: This kind of check should probably done for other services, as well. I didn't do it so far, since there are so many other things I would like to change in this controller (mainly the thread-synchronization issues and splitting up functionalities).


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

Before, we were returning success, as soon as the hardware interface
attempted to setup the payload.

This change reads the payload information from the robot and only
returns success if the read payload matches with what the user
requested.

This is active by default, but will be inactive when using mock
hardware.

Add tests verifying setPayload works with URSim and mock hardware

(cherry picked from commit fbf5704)

# Conflicts:
#	ur_robot_driver/launch/ur_control.launch.py
#	ur_robot_driver/src/hardware_interface.cpp
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@mergify mergify Bot added conflicts humble Relevant for humble and higher ROS versions labels Apr 29, 2026
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Apr 29, 2026

Cherry-pick of fbf5704 has failed:

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

You are currently cherry-picking commit fbf5704.
  (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_controllers/include/ur_controllers/gpio_controller.hpp
	modified:   ur_controllers/src/gpio_controller.cpp
	modified:   ur_controllers/src/gpio_controller_parameters.yaml
	modified:   ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
	modified:   ur_robot_driver/resources/rtde_output_recipe.txt
	modified:   ur_robot_driver/test/integration_test_io_controller.py
	modified:   ur_robot_driver/test/test_common.py
	modified:   ur_robot_driver/test/test_mock_hardware.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_robot_driver/launch/ur_control.launch.py
	both modified:   ur_robot_driver/src/hardware_interface.cpp
	deleted by us:   ur_robot_driver/urdf/ur.ros2_control.xacro

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 Apr 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant