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

Addresses UR5 model display issue #79

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

kumar-sanjeeev
Copy link

This PR addresses the issue of the UR5 model display.

  • added the ur10 model to the ur_description directory.
  • removed ur5_description and updated ur_description to accommodate all UR models.

Copy link
Owner

@sea-bass sea-bass left a comment

Choose a reason for hiding this comment

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

Thank you! Few things for initial review:

  1. Thanks for fixing those docs API sections. Would you be willing to split that into a separate PR?
  2. You can just delete that UR5 example and leave the UR10
  3. The UR on base example at https://github.com/sea-bass/pyroboplan/blob/main/examples/differential_ik_whole_body.py will also need to be updated for the UR10.

@@ -25,6 +25,14 @@ pyroboplan.models.two\_dof module
:undoc-members:
:show-inheritance:

pyroboplan.models.ur5 module
Copy link
Owner

Choose a reason for hiding this comment

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

Should ur10 now also be here?

Copy link
Author

@kumar-sanjeeev kumar-sanjeeev Jan 15, 2025

Choose a reason for hiding this comment

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

Thanks for pointing this out. I am fixing the docs in a separate PR and will address this issue there.

@kumar-sanjeeev
Copy link
Author

Thank you! Few things for initial review:

  1. Thanks for fixing those docs API sections. Would you be willing to split that into a separate PR?
  2. You can just delete that UR5 example and leave the UR10
  3. The UR on base example at https://github.com/sea-bass/pyroboplan/blob/main/examples/differential_ik_whole_body.py will also need to be updated for the UR10.
  1. Nice suggestion. I will fix them in a separate PR.
  2. I deleted intro_pinocchio_ur5_sim.py, is this what you meant?
  3. I created a separate utility module for UR10 and modified differential_ik_whole_body example accordingly. As of now UR5 utility module is still present. Do you want to keep it?

If all the changes are okay, I will submit another PR to fix the documentation after your feedback.

Copy link
Owner

@sea-bass sea-bass left a comment

Choose a reason for hiding this comment

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

Tested the examples and they work and look great -- thank you!

Comment on lines +34 to +39
The Panda model.
collision_model : `pinocchio.Model`
The Panda collision geometry model.
srdf_filename : str, optional
Path to the SRDF file describing the excluded collision pairs.
If not specified, uses a default file included with the Panda model.
Copy link
Owner

Choose a reason for hiding this comment

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

Replace Panda with "UR10" -- this might have been my fault in the UR5 one, so probably worth looking there too

urdf_filename = os.path.join(package_dir, "urdf", "ur5_on_base.urdf")

return pinocchio.buildModelsFromUrdf(urdf_filename, package_dirs=models_folder)


def add_ur5_on_base_self_collisions(model, collision_model, srdf_filename=None):
"""
Adds link self-collisions to the Panda collision model.
Adds link self-collisions to the UR5 collision model.
Copy link
Owner

Choose a reason for hiding this comment

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

Indeed, Panda is in this docstring (few lines below too).

@sea-bass sea-bass linked an issue Jan 16, 2025 that may be closed by this pull request
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.

UR5 model display issues
2 participants