Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an example with a passive joint (backport #172) #307

Merged
merged 2 commits into from
Apr 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2024

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.

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 7d5ec5d)

# Conflicts:
#	doc/index.rst
@mergify mergify bot added the conflicts label Apr 30, 2024
Copy link
Contributor Author

mergify bot commented Apr 30, 2024

Cherry-pick of 7d5ec5d 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

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde ahcorde merged commit 374cac6 into iron Apr 30, 2024
5 checks passed
@ahcorde ahcorde deleted the mergify/bp/iron/pr-172 branch April 30, 2024 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants