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

Merge sdf12 ➡️ sdf13 #1182

Merged
merged 6 commits into from
Oct 3, 2022
Merged

Merge sdf12 ➡️ sdf13 #1182

merged 6 commits into from
Oct 3, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf12 ➡️ sdf13

Branch comparision: sdf13...sdf12

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

@scpeters
parser_urdf: add //frame for reduced links/joints (#1148)
26569a5 
Currently the location of some links and joints is lost
when fixed joints are reduced and links lumped together.
This adds //model/frame tags with the same name and
pose of the reduced links and joints.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Merge branch 'sdf9' into scpeters/merge_9_12
c80fbb3
@scpeters
Merge pull request #1176 from gazebosim/scpeters/merge_9_12
ca31eca 
Merge sdf9 ➡️  sdf12
@scpeters
Merge branch 'sdf12' into scpeters/merge_12_to_13
8de8349
@scpeters
urdf: use sdf::Frame::ToElement internally (#1182)
f20edfd 
Follow-up for #1148 with a cleaner implementation for
the sdf13 branch that constructs sdf::Frame objects
and serializes them to a string rather than using
a stringstream to construct XML.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from azeey as a code owner September 30, 2022 18:50
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Sep 30, 2022
@scpeters
Copy link
Member Author

Note to reviewers; I've added a f20edfd to this branch that includes the changes from #1149 that make the serialization of //frame objects a bit cleaner. I recommend reviewing that commit individually to see the difference from the implementation in #1148

@scpeters scpeters mentioned this pull request Sep 30, 2022
Closed
9 tasks
@codecov
Copy link

codecov bot commented Sep 30, 2022 •
edited
Loading

Codecov Report

Merging #1182 (ffea2ed) into sdf13 (a5be6ab) will increase coverage by 0.00%.
The diff coverage is 90.90%.

@@           Coverage Diff           @@
##            sdf13    #1182   +/-   ##
=======================================
  Coverage   87.05%   87.06%           
=======================================
  Files         125      125           
  Lines       15961    15983   +22     
=======================================
+ Hits        13895    13915   +20     
- Misses       2066     2068    +2
Impacted Files Coverage Δ
src/parser_urdf.cc 87.79% <90.90%> (+0.04%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@scpeters scpeters merged commit 12c4c4a into sdf13 Oct 3, 2022
@scpeters scpeters deleted the scpeters/merge_12_to_13 branch October 3, 2022 17:06
@scpeters scpeters mentioned this pull request Oct 18, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@azeey azeey Awaiting requested review from azeey azeey is a code owner

Assignees
No one assigned
Labels
🌱 garden Ignition Garden
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@scpeters @ahcorde