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

Merge sdf12 ➡️ main #1024

Merged
merged 13 commits into from
May 19, 2022
Merged

Merge sdf12 ➡️ main #1024

merged 13 commits into from
May 19, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf12 ➡️ main

Branch comparision: main...sdf12

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

WilliamLewww and others added 13 commits April 22, 2022 10:16
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Steve Peters <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
* Updated CMakeLists and Changelog for release

Signed-off-by: William Lew <[email protected]>

* Added code suggestions

Signed-off-by: William Lew <[email protected]>

* Added code suggestion

Signed-off-by: William Lew <[email protected]>
Friction parameters are expressed as a material in USD, this change will link the collision with the physics material

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
This helps resolve ambiguities in the SDF <inertial> tag by
clarifying the link’s center of mass location, explicitly
stating that the inertia is always about the link’s center of
mass, clarifying the  directions associated with moments/products of
inertia, and clarifying the ± sign convention for product of inertia.

The changes to the 1.5, 1.6, and 1.7 versions of inertial.sdf have
slight modifications to account for the presence of
//inertial/pose/@frame in 1.5, 1.6 and //inertial/pose/@relative_to in 1.7.

Thanks to Paul Mitiguy and Michael Sherman from Toyota Research
Institute for these improvements.

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@scpeters scpeters requested a review from azeey as a code owner May 18, 2022 21:12
@github-actions github-actions bot added the 🌱 garden Ignition Garden label May 18, 2022
@scpeters scpeters requested review from chapulina and iche033 May 18, 2022 22:00
@codecov
Copy link

codecov bot commented May 18, 2022

Codecov Report

Merging #1024 (ffdc7cd) into main (324a755) will not change coverage.
The diff coverage is n/a.

❗ Current head ffdc7cd differs from pull request most recent head 5e3ae91. Consider uploading reports for the commit 5e3ae91 to get more accurate results

@@           Coverage Diff           @@
##             main    #1024   +/-   ##
=======================================
  Coverage   66.66%   66.66%           
=======================================
  Files           2        2           
  Lines          27       27           
=======================================
  Hits           18       18           
  Misses          9        9           
Impacted Files Coverage Δ
src/EmbeddedSdf.cc 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 324a755...5e3ae91. Read the comment docs.

@scpeters scpeters merged commit dedd55e into main May 19, 2022
@scpeters scpeters deleted the scpeters/merge_12_to_main branch May 19, 2022 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants