Subtree in Merlin description to this project - #8
Merged
Conversation
…t I'd expect in the CREO model. Line 64 at the time of the commit. 0.125 expected.
…lose to the real now.
URDF completed See merge request manip/objects/merlin_mockup/merlin_mockup_description!1
…manip/objects/merlin_mockup/merlin_mockup_description into galactic-feature/mock_urdf
Humble feature/dextivr 238 See merge request imetro/mockup_descriptions/merlin/merlin_mockup_description!3
xacro-ifying in our standard format (and adding optional prefix) See merge request imetro/mockup_descriptions/merlin/merlin_mockup_description!4
Cleanup the mockups description for release See merge request imetro/mockup_descriptions/merlin/merlin_mockup_description!5
Add latch collision geometry See merge request imetro/mockup_descriptions/merlin/merlin_mockup_description!6
Updating for default mass properties See merge request imetro/mockup_descriptions/merlin/merlin_mockup_description!7
Add citation
Use the SPDX short name for the license
Member
Author
|
Merged over the latest main, tested in NASA-JSC-Robotics/clr_ws#31 |
crainen-nasa
approved these changes
Mar 25, 2026
Member
|
While were at it, did we want to update the faceplate cover to be textured with the merlin faceplate image? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moved the contents of https://github.com/NASA-JSC-Robotics/merlin_mockup_description into this repo, which will allow us to consolidate our descriptions for iMETRO into a single place (here),
Ran,
To pull in the complete history then did some minor cleanup to make it fit the repo.