Closed mergify[bot] closed 5 months ago
Cherry-pick of 7d5ec5dbad710d628bc14a82195c196f088621b8 has failed:
On branch mergify/bp/iron/pr-172
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit 7d5ec5d.
(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: gazebo_ros2_control_demos/launch/pendulum_example_effort.launch.py
new file: gazebo_ros2_control_demos/launch/pendulum_example_position.launch.py
new file: gazebo_ros2_control_demos/urdf/test_pendulum_effort.xacro.urdf
new file: gazebo_ros2_control_demos/urdf/test_pendulum_position.xacro.urdf
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: 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
Adds a demo example with a passive joint: A pendulum hinged on the existing cart example.
I also added a hint that the physics of the passive joint are not rendered correct if position or velocity interface is used.
This is an automatic backport of pull request #172 done by Mergify.