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.

Sign up for GitHub

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

Jump to bottom

Urscript interface (backport #721) #742

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Urscript interface (backport #721) #742

merged 1 commit into from
Jul 21, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 12, 2023

This is an automatic backport of pull request #721 done by Mergify.
Cherry-pick of 7ee47bd has failed:

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

You are currently cherry-picking commit 7ee47bd.
  (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_robot_driver/CMakeLists.txt
	modified:   ur_robot_driver/launch/ur_control.launch.py
	new file:   ur_robot_driver/src/urscript_interface.cpp
	new file:   ur_robot_driver/test/urscript_interface.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/doc/usage.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jul 12, 2023
@fmauch
Urscript interface (#721)
cac074d 
* Add a urscript interface node

* Add urscript_interface to standard launchfile

* Added documentation for urscript_interface

* Add a notice about incorrect script code

* Add test for urscript interface

* Move tests to one single tests

This should avoid that different tests run in parallel

* Wait for IO controller before checking IOs

* Write an initial textmessage when connecting the urscript_interface

* Wait for controller_manager services longer

* Make sure we have a clean robot state without any program running once we enter our test

similar to how we did it on the robot_driver test

* Remove unneeded Destructor definition

(cherry picked from commit 7ee47bd)
@fmauch fmauch added humble Relevant for humble and higher ROS versions and removed conflicts labels Jul 21, 2023
fmauch
fmauch approved these changes Jul 21, 2023
View reviewed changes
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, merge conflict in docs resolved.

@fmauch fmauch merged commit 698914b into humble Jul 21, 2023
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-721 branch July 21, 2023 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmauch fmauch fmauch approved these changes

Assignees
No one assigned
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@fmauch