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 a namespaced example (backport #457) #461

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 23, 2024

Similar to ros-controls/gazebo_ros2_control#181

But I haven't found a way to pass the namespace to ros_gz_sim create to automatically overwrite the namespace of the plugin, as it is possible with '-robot_namespace', 'r1' of gazebo_ros spawn_entity.py


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

@mergify mergify bot requested a review from ahcorde as a code owner December 23, 2024 13:38
@mergify mergify bot added the conflicts label Dec 23, 2024
Copy link
Contributor Author

mergify bot commented Dec 23, 2024

Cherry-pick of a7d5a40 has failed:

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

You are currently cherry-picking commit a7d5a40.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   doc/index.rst
	both deleted:    gz_ros2_control_demos/config/diff_drive_controller_velocity.yaml
	deleted by us:   gz_ros2_control_demos/launch/diff_drive_example.launch.py
	added by them:   ign_ros2_control_demos/config/diff_drive_controller.yaml
	added by us:     ign_ros2_control_demos/config/diff_drive_controller_velocity.yaml
	added by them:   ign_ros2_control_demos/launch/diff_drive_example_namespaced.launch.py
	both modified:   ign_ros2_control_demos/urdf/test_diff_drive.xacro.urdf

no changes added to commit (use "git add" and/or "git commit -a")

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 mentioned this pull request Dec 23, 2024
Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on humble

@ahcorde ahcorde merged commit 385442c into humble Dec 23, 2024
5 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-457 branch December 23, 2024 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants