search

ros-controls / ros2_control_demos

This repository aims at providing examples to illustrate ros2_control and ros2_controllers
https://control.ros.org
Apache License 2.0
392 stars 185 forks source link

Fix topic remappings (backport #565) #567

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago

This fixes some wrong/outdated topic remappings

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

mergify[bot] commented 1 month ago

Cherry-pick of 71a86bd9bbba2e0022312c5db41d57458ce30de4 has failed:

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

You are currently cherry-picking commit 71a86bd.
  (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:   example_15/bringup/config/rrbot_namespace_forward_position_publisher.yaml
    modified:   example_15/bringup/launch/rrbot_namespace.launch.py
    modified:   example_2/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   example_2/bringup/launch/diffbot.launch.py
    both modified:   example_7/bringup/launch/r6bot_controller.launch.py

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