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

UR20 description and meshes #657

Merged
merged 12 commits into from
Dec 18, 2023
Merged

UR20 description and meshes #657

merged 12 commits into from
Dec 18, 2023

Conversation

urrsk
Copy link
Contributor

@urrsk urrsk commented Sep 7, 2023

The UR20 meshes are added under Universal Robots A/S’ Terms and Conditions for Use of Graphical Documentation

The UR20 meshes are added under Universal Robots A/S'
Terms and Conditions for Use of Graphical Documentation
@fmessmer
Copy link
Contributor

thanks for the URDF and meshes 🎉
they work great for us....could we get this merged - and released to Noetic - some time soon?

Copy link
Contributor

@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.

Maybe we also want to add a README explaining the licensing situation with the UR20 meshes as we did it for the ROS 2 description?

@gavanderhoorn I feel like this would be a sensible point to create a noetic-devel branch. Technically, this would probably be possible to build and use on ROS noetic, as well, but since melodic isn't actively maintained anymore I feel like adding new features to a melodic-devel branch seems wrong.

ur20_moveit_config/CMakeLists.txt Outdated Show resolved Hide resolved
ur_description/package.xml Show resolved Hide resolved
Copy link
Contributor

@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.

With the cmake version increase of the UR16e being the only thing not necessarily belonging to this PR I woud be fine merging this. We'll just have to decide on the target branch.

@fmauch fmauch changed the base branch from melodic-devel to noetic-devel October 9, 2023 06:55
@RobertWilbrandt
Copy link
Contributor

I agree with merging this to noetic-devel. As there are no further melodic binary releases, people have to build from sources anyway to get this support and using noetic sets the right expectations about maintenance and robustness.

@fmauch
Copy link
Contributor

fmauch commented Oct 9, 2023

Alright, I'll merge this on Friday then and start releasing from a noetic branch.

Copy link
Member

@gavanderhoorn gavanderhoorn left a comment

Choose a reason for hiding this comment

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

First round of comments.

ur20_moveit_config/CHANGELOG.rst Outdated Show resolved Hide resolved
ur_description/meshes/ur20/LICENSE.txt Outdated Show resolved Hide resolved
ur_description/package.xml Show resolved Hide resolved
ur_kinematics/CMakeLists.txt Outdated Show resolved Hide resolved
ur_kinematics/ur_moveit_plugins.xml Outdated Show resolved Hide resolved
ur_description/package.xml Outdated Show resolved Hide resolved
urrsk and others added 3 commits October 13, 2023 08:56
Code change suggestions

Co-authored-by: Felix Exner (fexner) <felix_mauch@web.de>
Co-authored-by: G.A. vd. Hoorn <g.a.vanderhoorn@tudelft.nl>
Add additional UR20 meshes licens comment
Remove Changelog for ur20_moveit
README.md Outdated Show resolved Hide resolved
@fmauch fmauch requested a review from gavanderhoorn October 13, 2023 12:51
Co-authored-by: Felix Exner (fexner) <felix_mauch@web.de>
@urrsk
Copy link
Contributor Author

urrsk commented Oct 16, 2023

Please squash the commits when it is ready for getting merged.

README.md Show resolved Hide resolved
Co-authored-by: Felix Exner (fexner) <felix_mauch@web.de>
README.md Outdated Show resolved Hide resolved
@fmauch
Copy link
Contributor

fmauch commented Oct 30, 2023

@gavanderhoorn Could you give this another review please?

@fmessmer
Copy link
Contributor

fmessmer commented Nov 6, 2023

Alright, I'll merge this on Friday then and start releasing from a noetic branch.

what's blocking this PR from merging?

@fmauch
Copy link
Contributor

fmauch commented Nov 6, 2023

what's blocking this PR from merging?

A review requesting changes (or a re-review to be more precise, since these comments have been addressed).

@urrsk
Copy link
Contributor Author

urrsk commented Nov 14, 2023

@gavanderhoorn it would valuable if you could fine the time in the near future to review this PR again.
I believe requested changes have been addressed. Otherwise please let me know.

Copy link
Member

@gavanderhoorn gavanderhoorn left a comment

Choose a reason for hiding this comment

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

apologies for my delayed reply.

I've left a couple in-line comments, which I expect are easily resolved.

If desired, I can review again tomorrow, or early next week.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
ur20_moveit_config/config/joint_limits.yaml Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

👍 to storing the license file in the repository. It's essentially a contract, and clients should have a copy of that contract if they are going to be bound by it.

[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)

[![License](https://img.shields.io/badge/License-Universal%20Robots%20A/S%E2%80%99%20Terms%20and%20Conditions%20for%20Use%20of%20Graphical%20Documentation-blue.svg)](https://www.universal-robots.com/legal/terms-and-conditions/terms_and_conditions_for_use_of_graphical_documentation.txt)
Copy link
Member

@gavanderhoorn gavanderhoorn Nov 23, 2023

Choose a reason for hiding this comment

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

Should we instead make this point to the ur_description/meshes/ur20/LICENSE.txt file? The online version could be changed at any time. The files in this repository would fall under the version of the license as it is right now, in this PR. It would make sense to me to make this badge link to the version the files would fall under.

Copy link
Contributor

Choose a reason for hiding this comment

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

From what I understood, the license is structured such that the latest version always is relevant (see point 1.4)

... If you download a software package that includes the Graphical Documentation, your use of the Graphical Documentation will be subject to and governed by the latest version of the T&Cs, which can be found here: ...

Given that clause I think it does make sense to link to the online version.

Copy link
Member

@gavanderhoorn gavanderhoorn Nov 24, 2023

Choose a reason for hiding this comment

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

I'm not sure that's legal. There would be no change notification to current users, UR would be able to silently, unilaterally change the complete license without anyone being aware of it, and with all licenses I've worked with (and in the jurisdictions I've had to work with licenses), once you have a copy of the artefacts under that license, that copy and/or version will always fall under the version of the license as it was when you agreed to it.

I have seen licenses where there are provisions for updates made by the licensor, but those always include some sort of notification period, allowing current licensees to terminate their use of whatever is under the existing license if they feel they can't, or don't want to, agree to the new version.

Additionally, there is already a copy of the current version in the repository -- or at least there will be, after merging this PR.

It's best practice to include a copy of the license in all cases, even with OSS licenses. We don't do that currently in this repository, but that's an omission and should be fixed (in a later PR).

Copy link
Member

Choose a reason for hiding this comment

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

The same section 1.4 also states:

However, you may only make the Graphical Documentation or any whole or partial copies thereof available to the public via download if it is part of a downloadable software package that includes a copy of the T&Cs.

which is what this PR will result in: a copy will be included.

So it doesn't seem strange to me to then point to that copy, and not the online version.

That seems like it would just lead to confusing situations.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You have a point. Though the motivation was to remove the burden from the repo owner to ensure that the license is up to date.

@gavanderhoorn
Copy link
Member

I've approved the changes to the previous review so as to not block this.

I've left new comments as comments, so they don't block.

fmauch and others added 4 commits November 24, 2023 06:44
Co-authored-by: G.A. vd. Hoorn <g.a.vanderhoorn@tudelft.nl>
Co-authored-by: G.A. vd. Hoorn <g.a.vanderhoorn@tudelft.nl>
Added clarifying text reading the UR license to the Readme
@fmessmer
Copy link
Contributor

still eagerly waiting for this to get merged and released 🙄

@fmauch
Copy link
Contributor

fmauch commented Dec 18, 2023

As discussed and requested by UR, I'll leave the license badge point to the online version and merge things as they currently are.

@fmauch fmauch merged commit cdf646b into ros-industrial:noetic-devel Dec 18, 2023
4 checks passed
@urrsk urrsk deleted the ur20 branch December 19, 2023 12:06
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.

6 participants