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 motoman resources (#378 rebased) #405

Conversation

gavanderhoorn
Copy link
Member

As I did not want to risk pushing to a company branch (in #378), I've rebased and added a few additional commits.

Attribution retained where appropriate.

I'll rebase follow-up PRs (#395, #396 and #397) as well.

Alec Tiefenthal and others added 7 commits December 7, 2020 11:41
Make robots use materials from that package so they do not conflict when using multiple arms.
And remove macro-local definitions of colors and materials from .xacro files.
Both not necessarily 'official' in any way, but used in (old) xacro:macros.
@gavanderhoorn
Copy link
Member Author

Merging as I've reviewed the original #378 and CI is green.

@gavanderhoorn gavanderhoorn merged commit 9ade90a into ros-industrial:kinetic-devel May 15, 2021
@gavanderhoorn gavanderhoorn deleted the add-motoman-resources-rebased branch May 15, 2021 15:23
This was referenced May 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant