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 ➡️ sdf13 #1177

Merged
merged 14 commits into from
Sep 29, 2022
Merged

Merge sdf12 ➡️ sdf13 #1177

merged 14 commits into from
Sep 29, 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)

MarqRazz and others added 14 commits August 30, 2022 15:05
Signed-off-by: Brian Chen <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
* camera.sdf: fields for projection matrix

Signed-off-by: Steve Peters <[email protected]>
Update Changelog and Migration guide.

Signed-off-by: Steve Peters <[email protected]>
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 <[email protected]>
These directories are added via our cmake macros and don't need to be
here. Additionally, one of the patterns was incorrect and adding a
relative path to the include dirs.

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@scpeters scpeters requested a review from azeey as a code owner September 29, 2022 03:22
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Sep 29, 2022
@codecov
Copy link

codecov bot commented Sep 29, 2022

Codecov Report

Merging #1177 (9a67dfd) into sdf13 (91a6ffc) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##            sdf13    #1177      +/-   ##
==========================================
+ Coverage   87.00%   87.05%   +0.04%     
==========================================
  Files         125      125              
  Lines       15834    15885      +51     
==========================================
+ Hits        13777    13828      +51     
  Misses       2057     2057              
Impacted Files Coverage Δ
src/Camera.cc 89.03% <100.00%> (+1.24%) ⬆️
src/parser_urdf.cc 87.74% <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 1e5be74 into sdf13 Sep 29, 2022
@scpeters scpeters deleted the scpeters/merge_12_13 branch September 29, 2022 15:42
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.

6 participants