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 sdf9 ➡️ sdf12 #1167

Merged
merged 3 commits into from
Sep 22, 2022
Merged

Merge sdf9 ➡️ sdf12 #1167

merged 3 commits into from
Sep 22, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf9 ➡️ sdf12

Branch comparision: sdf12...sdf9

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

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
The urdf_gazebo_extensions.urdf file had incorrect kinematics
with link3 being the child of two different joints.
This adds a link4 and replaces joint13 with joint14
connecting link1 and link4. This also fixes some
expectations about the implicit_spring_damper tags.

* parser_urdf: clean up internal functions by removing
unused parameters and making other parameters const.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from azeey as a code owner September 21, 2022 22:29
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Sep 21, 2022
@codecov
Copy link

codecov bot commented Sep 21, 2022

Codecov Report

Merging #1167 (0f068a8) into sdf12 (7698671) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##            sdf12    #1167      +/-   ##
==========================================
- Coverage   91.69%   91.69%   -0.01%     
==========================================
  Files          80       80              
  Lines       13083    13079       -4     
==========================================
- Hits        11997    11993       -4     
  Misses       1086     1086              
Impacted Files Coverage Δ
src/parser_urdf.cc 87.75% <100.00%> (-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 53d7944 into sdf12 Sep 22, 2022
@scpeters scpeters deleted the scpeters/merge_9_12 branch September 22, 2022 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants