UniversalRobots / Universal_Robots_ROS2_Driver

Universal Robots ROS2 driver supporting CB3 and e-Series
BSD 3-Clause "New" or "Revised" License
437 stars 227 forks source link

Allow setting the analog output domain when setting an analog output (backport #1123) #1130

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago

This basically implements a service for https://github.com/ros-industrial/ur_msgs/pull/30


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

mergify[bot] commented 1 month ago

Cherry-pick of 8f2dfa97eee6ce443f5eb43a611f3690e5c7d19e has failed:

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

You are currently cherry-picking commit 8f2dfa9.
  (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_robot_driver/include/ur_robot_driver/hardware_interface.hpp
    modified:   ur_robot_driver/src/hardware_interface.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    deleted by us:   ur_controllers/doc/index.rst
    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