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 11 -> 12 #756

Merged
merged 46 commits into from
Nov 23, 2021
Merged

Merge 11 -> 12 #756

merged 46 commits into from
Nov 23, 2021

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf11 to sdf12

Branch comparison: sdf12...sdf11

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

chapulina and others added 30 commits April 21, 2020 19:18
@chapulina
[sdf6] Changelog links to BitBucket backup (gazebosim#237)
8e558ee 
* [sdf6] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* more fixes, new version of script

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters @chapulina
[sdf4] Update BitBucket links (gazebosim#248) (gazebosim#258)
530a856 
* [sdf4] Update BitBucket links

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* fix a few more links

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: chapulina <louise@openrobotics.org>
@j-rivero
Patch popen/pclose method for Windows
40ded2a 
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Merge pull request gazebosim#297 from osrf/sdf6_popen_win_fix
c6748a3 
Patch popen/pclose method for Windows
@iche033
Parse rpyOffset as radians (gazebosim#497)
3848066 
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@j-rivero
Merge pull request gazebosim#580 from osrf/sdf6_pr606_backport
3571e62 
Backport sdf6: Move recursiveSameTypeUniqueNames from ign.cc to parser.cc
@j-rivero
Prepare 6.3.0 release (gazebosim#587)
4d0ca52 
* Prepare version 6.3.0

* Add entry in Changelog for 497
@j-rivero
Fix flattening logic for nested model names (sdf6) (gazebosim#597)
e17aef4 
* Fix flattening logic for composed names in nested models

When nested models use names composed by several elements
(i.e: my_model::link) these were not converted by the
flattening logic inside parser.cc. The change makes the
logic to work with composed names.

Added a test to check that this is indeed working as
expected.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero @azeey
Translate poses of nested models inside other nested models (sdf6) (g…
41a2c3c 
…azebosim#596)

Translate poses of nested models inside other nested models

When addNestedModel function is called, it processes links and joints
to translate the pose accordingly to parent pose. This was not done
for nested models inside the SDF being processed. The change includes 
nested models in the same way that is doing for links and add a test that 
fails without the change.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
@j-rivero
Prepare version 6.3.1 (gazebosim#617)
6deeb06 
* Prepare version 6.3.1
* Implement github actions for sdf6 branch

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@scpeters
Use Ubuntu bionic in CI (gazebosim#626)
feec202 
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
@scpeters
Create CODEOWNERS with azeey and scpeters (gazebosim#650)
f13264e 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@chapulina
👩‍🌾 Remove bitbucket-pipelines and backport labeler / triage (gazebos…
b06cc18 
…im#674)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@iche033 @ahcorde @scpeters
Fix xyz and rpy offsets in fixed joint reduction (gazebosim#500)
c02aca7 
* parse rpyOffset as radians

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update tf for xyz and rpy offsets

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove inverse transform function in urdf parser

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* inject corrected_offets tag

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix tag removal logic

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <alejandro@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Bump to 9.6.1 (gazebosim#691)
8cbc9b5 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@chapulina
🎈 10.6.0 (gazebosim#694)
a55f9e3 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters
Codecheck fixes (gazebosim#730)
b0f7f4f 
* Pass by const reference
* Remove unused variable
* Simplify redundant logic

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Check joint parent/child names in Root::Load (gazebosim#727)
b25ecbc 
* ign_TEST: expect joint_axis_infinite_limits valid
* Add missing link6 to test/sdf/joint_axis_*.sdf

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Check joint parent link names in Model::Load (gazebosim#726)
aa9362b 
* ign_TEST: expect joint_axis_infinite_limits valid
* Add missing link6 to test/sdf/joint_axis_*.sdf

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Merge branch 'sdf10' into merge_10_11
c85a1b2
@azeey
Backport test utilities from sdf10 (gazebosim#731)
344312c 
Adds sdf::testing::SourceFile, sdf::testing::TestFile, sdf::testing::env, and sdf::testing::setenv and updates tests to use them. This makes it easier to backport other changes from newer branches.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Backport gazebosim#721 to sdf9: Make exception for plugins when check…
32540cc 
…ing for name uniqueness (gazebosim#733)

* Backport test utilities from sdf10
* Backport Console redirect functionality
* Make exception for plugins when checking for name uniqueness (gazebosim#721)
* Replace unavailable error printing API

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@scpeters
Merge pull request gazebosim#734 from scpeters/merge_10_11
8b12338 
Merge 10 -> 11 and resolve conflicts
@nlamprian @scpeters @azeey
Add force torque sensor (gazebosim#393)
ceae148 
Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@azeey @jennuine
Add Joint DOM API to access joint sensors (gazebosim#517)
798aad2 
* Add Joint DOM API to access joint sensors

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Add missing file

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* modified Joint::SensorNameExists

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>

Co-authored-by: Jenn Nguyen <jenn@openrobotics.org>
@mjcarroll @scpeters @azeey
Added Force Torque Noise functions + Unit tests (gazebosim#669)
209eba9 
* Added Force Torque Noise functions + Unit tests

Signed-off-by: Devansh <devansh@vt.edu>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@chapulina
6 ➡️ 9
e86f887 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@caguero
Prepare for v9.7.0 (gazebosim#739)
f805c95 
* Prepare for v9.7.0

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
@adlarkin
remove outdated deprecation note from parser_urdf.hh (gazebosim#740)
2905643 
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Merge branch 'sdf9' into chapulina/6_to_9
29f1370
scpeters and others added 13 commits November 5, 2021 16:53
@scpeters
Fix test file path in fixed_joint_reduction.cc
331ea53 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Use SemanticPose API in test
d6fab59 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Include nested model test
38be09c 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@azeey
Merge pull request gazebosim#738 from ignitionrobotics/chapulina/6_to_9
1a05444 
6 ➡️ 9
@FirefoxMetzger @scpeters @azeey
Documentation: Only allow one canonical_link attribute for model (gaz…
283d4d3 
…ebosim#716)

Signed-off-by: FirefoxMetzger <sebastian@wallkoetter.net>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
@scpeters
Fix URDF fixed joint reduction of plugins (gazebosim#745)
424bf9c 
There is special handling in the parser_urdf code to
update plugin fields when links are merged together
during fixed joint reduction. A test for this was
added to sdf6 in gazebosim#500. A portion of this test is
applied directly to the sdf10 branch to illustrate
a problem with ReduceSDFExtensionPluginFrameReplace
in parser_urdf.cc.

The original migration to use tinyxml2 in gazebosim#264 changed
the data structure used in SDFExtension to store
XMLDocuments instead of XMLPointers, which requires
an extra call to FirstChildElement, but the
ReduceSDFExtension*FrameReplace functions did not
receive this update. The fix here refactors the function
arguments to pass the first child element directly,
which simplifies the helper function implementation.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Merge branch 'sdf9' into merge_9_10
0262ecd
@chapulina
9 ➡️ 10 (gazebosim#750)
251c354 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters
Merge branch 'sdf10' into merge_10_11
553fdce
@scpeters
Adapt IncludeFrameWithSubmodel test to sdf11
ceea6a5 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Remove outdated IncludeFlatteningNames test/model
9cecc75 
The IncludeFlatteningNames test added in gazebosim#597 is no longer
relevant because nested model names are no longer flattened.
The model used by the test is removed as well since it is
not used elsewhere.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy sdf/1.7/forcetorque.sdf noise elements to 1.8
db26a60 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Merge pull request gazebosim#752 from ignitionrobotics/merge_10_11
a32ff42 
Merge 10 -> 11
@scpeters scpeters requested a review from azeey November 16, 2021 18:19
@github-actions github-actions bot added 🌱 garden Ignition Garden 🏯 fortress Ignition Fortress labels Nov 16, 2021
azeey
azeey reviewed Nov 22, 2021
View reviewed changes
Copy link
Collaborator

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but the branch needs to be updated now.

@scpeters
Copy link
Member Author

LGTM, but the branch needs to be updated now.

updated

@mjcarroll mjcarroll merged commit 8d728ce into gazebosim:sdf12 Nov 23, 2021
@scpeters scpeters deleted the merge_11_12 branch November 23, 2021 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azeey azeey azeey approved these changes

@mjcarroll mjcarroll mjcarroll approved these changes

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress 🌱 garden Ignition Garden
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@scpeters @azeey @mjcarroll @chapulina @j-rivero @iche033 @nlamprian @caguero @adlarkin @FirefoxMetzger