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 support for gz.msgs.EntityWrench (base branch: ros2) (backport #573) #575

Merged
merged 5 commits into from
Jul 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2024

🎉 New feature

Closes #566

Also replaces PR #572, now retargeted to the ros2 branch.

Summary

Adds the new ros_gz_interfaces/msg/EntityWrench, with structure compatible with gz.msgs.EntityWrench. This enables the user to apply wrenches to Gazebo entities using ROS topics.

Also implements the ros_gz_bridge mapping between ros_gz_interfaces/msg/EntityWrench and gz.msgs.EntityWrench.

Test it

Manual testing involves spawning any entity in Gazebo and loading the gz::sim::systems::ApplyLinkWrench plugin to the world SDF. Then, call the ros_gz_bridge to expose the entity wrench topic as follows (YAML syntax):

- topic_name: "/world/<world_name>/wrench"
  ros_type_name: "ros_gz_interfaces/msg/EntityWrench"
  gz_type_name: "gz.msgs.EntityWrench"

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


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

Signed-off-by: Victor T. N. <[email protected]>
(cherry picked from commit f9afb69)

# Conflicts:
#	ros_gz_bridge/README.md
#	ros_gz_bridge/test/utils/gz_test_msg.hpp
@mergify mergify bot added the conflicts label Jul 1, 2024
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

Cherry-pick of f9afb69 has failed:

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

You are currently cherry-picking commit f9afb69.
  (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:   ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp
	modified:   ros_gz_bridge/ros_gz_bridge/mappings.py
	modified:   ros_gz_bridge/src/convert/ros_gz_interfaces.cpp
	modified:   ros_gz_bridge/test/utils/gz_test_msg.cpp
	modified:   ros_gz_bridge/test/utils/ros_test_msg.cpp
	modified:   ros_gz_bridge/test/utils/ros_test_msg.hpp
	modified:   ros_gz_interfaces/CMakeLists.txt
	modified:   ros_gz_interfaces/README.md
	new file:   ros_gz_interfaces/msg/EntityWrench.msg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros_gz_bridge/README.md
	both modified:   ros_gz_bridge/test/utils/gz_test_msg.hpp

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

Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

One minor issue. Otherwise, LGTM!

ros_gz_bridge/README.md Outdated Show resolved Hide resolved
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde ahcorde merged commit c19d57d into humble Jul 9, 2024
8 of 11 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-573 branch July 9, 2024 10:06
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.

3 participants