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 missing bridges for simulation time (backport #443) #446

Merged
merged 3 commits into from
Dec 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2024

We need a parameter bridge for receiving the simulation time in the ROS world.

Some of them got (accidentally?) removed with #266, others never had the bridge.

Fixes #439


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

(cherry picked from commit 301ca58)

# Conflicts:
#	gz_ros2_control_demos/launch/cart_example_position.launch.py
#	gz_ros2_control_demos/launch/cart_example_velocity.launch.py
#	gz_ros2_control_demos/launch/diff_drive_example.launch.py
#	gz_ros2_control_demos/launch/gripper_mimic_joint_example_effort.launch.py
@mergify mergify bot added the conflicts label Dec 2, 2024
@mergify mergify bot requested a review from ahcorde as a code owner December 2, 2024 08:42
Copy link
Contributor Author

mergify bot commented Dec 2, 2024

Cherry-pick of 301ca58 has failed:

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

You are currently cherry-picking commit 301ca58.
  (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:   gz_ros2_control_tests/tests/position_test.py
	modified:   ign_ros2_control_demos/launch/ackermann_drive_example.launch.py
	modified:   ign_ros2_control_demos/launch/cart_example_effort.launch.py
	modified:   ign_ros2_control_demos/launch/pendulum_example_effort.launch.py
	modified:   ign_ros2_control_demos/launch/pendulum_example_position.launch.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gz_ros2_control_demos/launch/cart_example_position.launch.py
	deleted by us:   gz_ros2_control_demos/launch/cart_example_velocity.launch.py
	deleted by us:   gz_ros2_control_demos/launch/diff_drive_example.launch.py
	deleted by us:   gz_ros2_control_demos/launch/gripper_mimic_joint_example_effort.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

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde ahcorde merged commit c285031 into humble Dec 2, 2024
5 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-443 branch December 2, 2024 09:05
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.

2 participants