Skip to content

9 to 10 20211108#741

Closed
nkoenig wants to merge 28 commits intosdf10from
9-to-10-20211108
Closed

9 to 10 20211108#741
nkoenig wants to merge 28 commits intosdf10from
9-to-10-20211108

Conversation

@nkoenig
Copy link
Copy Markdown
Contributor

@nkoenig nkoenig commented Nov 9, 2021

➡️ Forward port

Port sdf9 to sdf10

Branch comparison: sdf10...sdf9

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

chapulina and others added 28 commits April 21, 2020 19:18
* [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>
* [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>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Patch popen/pclose method for Windows
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Backport sdf6: Move recursiveSameTypeUniqueNames from ign.cc to parser.cc
* Prepare version 6.3.0

* Add entry in Changelog for 497
* 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>
)

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>
* 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>
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* 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>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
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>
…ame uniqueness (#733)

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

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
* 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>
* 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>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* Prepare for v9.7.0

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig nkoenig requested review from azeey and scpeters November 9, 2021 04:05
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Nov 9, 2021
@scpeters
Copy link
Copy Markdown
Member

scpeters commented Nov 9, 2021

there's a problem with the conflict resolution in parser_urdf.cc; I'll open a separate pull request to fix it

@scpeters scpeters closed this Nov 9, 2021
@scpeters
Copy link
Copy Markdown
Member

scpeters commented Nov 9, 2021

I've working on fixing the merge conflicts, but the test from #500 is not passing. After looking into it a bit, I believe the ReduceSDFExtension*FrameReplace functions have been broken since we migrated to tinyxml2 in #264. I will open an issue for this and try to address it quickly before resuming this merge PR

@scpeters
Copy link
Copy Markdown
Member

I've working on fixing the merge conflicts, but the test from #500 is not passing. After looking into it a bit, I believe the ReduceSDFExtension*FrameReplace functions have been broken since we migrated to tinyxml2 in #264. I will open an issue for this and try to address it quickly before resuming this merge PR

I will retry this merge after #745 gets in

@scpeters
Copy link
Copy Markdown
Member

2nd try in #750

@scpeters scpeters deleted the 9-to-10-20211108 branch November 12, 2021 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔮 dome Ignition Dome

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants