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

Ex10: use gpio_command_controller (backport #627) #713

Merged
merged 1 commit into from
Feb 1, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2025

This changes the example_10 to use the gpio_command_controller proposed with ros-controls/ros2_controllers#1251

I also mentioned the /dynamic_joint_states topic from JSB.


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

@mergify mergify bot added the conflicts label Feb 1, 2025
Copy link
Contributor Author

mergify bot commented Feb 1, 2025

Cherry-pick of 332ede0 has failed:

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

You are currently cherry-picking commit 332ede0.
  (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_10/CMakeLists.txt
	deleted:    example_10/controllers/gpio_controller.cpp
	deleted:    example_10/controllers/include/ros2_control_demo_example_10/gpio_controller.hpp
	modified:   example_10/doc/userdoc.rst
	modified:   example_10/hardware/rrbot.cpp
	modified:   example_10/ros2_control_demo_example_10.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   example_10/bringup/config/rrbot_controllers.yaml
	both modified:   example_10/package.xml

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

* Remove controller and use upstream one

* Fix error messages

* Fix last demo section

* Use fork for ros2_controllers

* Fix CMakeLists and deps

* Use upstream ros2_controllers

* Update docs with latest changes of controller

* Update with new message type

* Switch to master branch of ros2_control

* Remove old controller from pluginlib xml

* Use released ros2_controllers
@christophfroehlich christophfroehlich merged commit 7a5b290 into humble Feb 1, 2025
7 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-627 branch February 1, 2025 16:42
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.

1 participant