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

Add UR30 model #126

Merged
merged 5 commits into from Dec 22, 2023
Merged

Add UR30 model #126

merged 5 commits into from Dec 22, 2023

Conversation

fmauch
Copy link
Collaborator

@fmauch fmauch commented Dec 21, 2023

Adds the UR30 model to the description.

@urrsk
Copy link
Member

urrsk commented Dec 21, 2023

We might need the license to be place next to the mesh files to avoid the confusion which mesh files is under what license.
Alternative could be to update all UR robot models with new meshes

urrsk
urrsk reviewed Dec 21, 2023
View reviewed changes
README.md Outdated Show resolved Hide resolved
@fmauch fmauch requested a review from urrsk December 21, 2023 13:50
urrsk
urrsk reviewed Dec 21, 2023
View reviewed changes
meshes/ur30/LICENSE.txt Outdated Show resolved Hide resolved
@fmauch fmauch requested a review from urrsk December 21, 2023 15:32
urrsk
urrsk approved these changes Dec 22, 2023
View reviewed changes
Copy link
Member

@urrsk urrsk left a comment •
edited by VinDp

Choose a reason for hiding this comment

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

The license is in place

  • Some one else verifies the URDF in rviz and behavior in Gazebo
  • When merging, please squash this PR to one commit

VinDp
VinDp approved these changes Dec 22, 2023
View reviewed changes
Copy link
Collaborator

@VinDp VinDp left a comment

Choose a reason for hiding this comment

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

Tested: everything looked fine.

@VinDp VinDp merged commit 324b54c into UniversalRobots:rolling Dec 22, 2023
6 checks passed
mergify bot pushed a commit that referenced this pull request Dec 22, 2023
@fmauch @mergify
Add UR30 model (#126)
5996de7 
* Add UR30 model

* Update contribution information in UR30 mesh files

* Add UR30 model

* Copy license to ur30 folder

* Fixed LICENSE whitespace check exclude

(cherry picked from commit 324b54c)

# Conflicts:
#	test/test_ur_urdf_xacro.py
#	urdf/ur_mocked.urdf.xacro
@mergify mergify bot mentioned this pull request Dec 22, 2023
Closed
VinDp pushed a commit that referenced this pull request Mar 19, 2024
@fmauch @VinDp
Add UR30 model (#126)
332f479 
* Add UR30 model

* Update contribution information in UR30 mesh files

* Add UR30 model

* Copy license to ur30 folder

* Fixed LICENSE whitespace check exclude

(cherry picked from commit 324b54c)

# Conflicts:
#	test/test_ur_urdf_xacro.py
#	urdf/ur_mocked.urdf.xacro
@VinDp VinDp mentioned this pull request Mar 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VinDp VinDp VinDp approved these changes

@urrsk urrsk urrsk approved these changes

@RobertWilbrandt RobertWilbrandt Awaiting requested review from RobertWilbrandt

Assignees
No one assigned
Labels
backport-humble backport-iron
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fmauch @urrsk @VinDp