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

Improve parameter handling (backport #664) #671

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2024

🦟 Bug fix

Summary

Builds on top of #663 and improves parameter handling so that <param> tags can be used in XML just like how it's used in <node> tags. Previously, the the bridge_params parameter was used and there was some custom parsing in the code. This PR uses code from launch_ros/actions/node.py so we get all the parsing for free.

So to set qos overrides, it would look like

<ros_gz_bridge 
    bridge_name="ros_gz_bridge"
    config_file="$(find-pkg-share ros_gz_sim_demos)/config/air_pressure.yaml"
    use_composition="false">
    
  <param name="qos_overrides./air_pressure.subscription.reliability" value="best_effort" />
</ros_gz_bridge>

Instead of

  <ros_gz_bridge
    bridge_name="ros_gz_bridge"
    config_file="$(find-pkg-share ros_gz_sim_demos)/config/air_pressure.yaml"
    use_composition="true"
    bridge_params="'qos_overrides./air_pressure.publisher.reliability': 'best_effort'" />

Checklist

  • Signed all commits for DCO
  • Added tests
  • 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 #664 done by [Mergify](https://mergify.com).

azeey and others added 2 commits December 11, 2024 14:22
Signed-off-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 819c943)
…dling

(cherry picked from commit 705ee56)

# Conflicts:
#	.github/workflows/ros2-ci.yml
#	README.md
#	ros_gz/CHANGELOG.rst
#	ros_gz/package.xml
#	ros_gz_bridge/CHANGELOG.rst
#	ros_gz_bridge/package.xml
#	ros_gz_image/CHANGELOG.rst
#	ros_gz_image/package.xml
#	ros_gz_interfaces/CHANGELOG.rst
#	ros_gz_interfaces/package.xml
#	ros_gz_sim/CHANGELOG.rst
#	ros_gz_sim/package.xml
#	ros_gz_sim_demos/CHANGELOG.rst
#	ros_gz_sim_demos/package.xml
#	test_ros_gz_bridge/CHANGELOG.rst
#	test_ros_gz_bridge/package.xml
@mergify mergify bot requested a review from ahcorde as a code owner December 11, 2024 14:22
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of 705ee56 has failed:

On branch mergify/bp/jazzy/pr-664
Your branch is ahead of 'origin/jazzy' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 705ee56.
  (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 <file>..." to mark resolution)
	both added:      .github/workflows/ros2-ci.yml
	both added:      README.md
	both added:      ros_gz/CHANGELOG.rst
	both added:      ros_gz/package.xml
	both added:      ros_gz_bridge/CHANGELOG.rst
	both added:      ros_gz_bridge/package.xml
	both added:      ros_gz_image/CHANGELOG.rst
	both added:      ros_gz_image/package.xml
	both added:      ros_gz_interfaces/CHANGELOG.rst
	both added:      ros_gz_interfaces/package.xml
	both added:      ros_gz_sim/CHANGELOG.rst
	both added:      ros_gz_sim/package.xml
	both added:      ros_gz_sim_demos/CHANGELOG.rst
	both added:      ros_gz_sim_demos/package.xml
	both added:      test_ros_gz_bridge/CHANGELOG.rst
	both added:      test_ros_gz_bridge/package.xml

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 11, 2024
8 tasks
@ahcorde ahcorde closed this Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants