Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 16, 2025

Changes all our realtime_tools containers to RealtimeThreadSafeBox, seems like that is fine everywhere.
Also made it so that any reading or writing done outside of real-time threads will retry 10 times before failing.


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

Use RealtimeThreadSafeBox instead of RealTimeBuffer.

Also made it so that any reading or writing done outside of real-time threads will retry 10 times before failing in non-RT contexts.

(cherry picked from commit 76b3e37)

# Conflicts:
#	ur_controllers/include/ur_controllers/force_mode_controller.hpp
@mergify
Copy link
Author

mergify bot commented Sep 16, 2025

Cherry-pick of 76b3e37 has failed:

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

You are currently cherry-picking commit 76b3e37.
  (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:   ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp
	modified:   ur_controllers/include/ur_controllers/tool_contact_controller.hpp
	modified:   ur_controllers/include/ur_controllers/ur_configuration_controller.hpp
	modified:   ur_controllers/src/force_mode_controller.cpp
	modified:   ur_controllers/src/passthrough_trajectory_controller.cpp
	modified:   ur_controllers/src/tool_contact_controller.cpp
	modified:   ur_controllers/src/ur_configuration_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_controllers/include/ur_controllers/force_mode_controller.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

@urfeex urfeex removed the conflicts label Sep 16, 2025
@urfeex urfeex merged commit ea76f8e into jazzy Sep 16, 2025
6 checks passed
@urfeex urfeex deleted the mergify/bp/jazzy/pr-1474 branch September 16, 2025 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants