Merge 10 -> 11 #752
Merged
Merge 10 -> 11 #752
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [sdf6] Changelog links to BitBucket backup Signed-off-by: Louise Poubel <[email protected]> * more fixes, new version of script Signed-off-by: Louise Poubel <[email protected]>
* [sdf4] Update BitBucket links Signed-off-by: Louise Poubel <[email protected]> * fix a few more links Signed-off-by: Steven Peters <[email protected]> Co-authored-by: Steven Peters <[email protected]> Co-authored-by: chapulina <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Patch popen/pclose method for Windows
Signed-off-by: Ian Chen <[email protected]>
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 <[email protected]>
) 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 <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
* Prepare version 6.3.1 * Implement github actions for sdf6 branch Signed-off-by: Steve Peters <[email protected]> Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Steven Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* parse rpyOffset as radians Signed-off-by: Ian Chen <[email protected]> * update tf for xyz and rpy offsets Signed-off-by: Ian Chen <[email protected]> * remove inverse transform function in urdf parser Signed-off-by: Ian Chen <[email protected]> * inject corrected_offets tag Signed-off-by: Ian Chen <[email protected]> * Fix tag removal logic Signed-off-by: Steven Peters <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]> Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
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 <[email protected]>
…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 <[email protected]>
Signed-off-by: Nick Lamprianidis <[email protected]> Co-authored-by: Steve Peters <[email protected]>
* Add Joint DOM API to access joint sensors Signed-off-by: Addisu Z. Taddese <[email protected]> * Add missing file Signed-off-by: Addisu Z. Taddese <[email protected]> * modified Joint::SensorNameExists Signed-off-by: Jenn Nguyen <[email protected]> Co-authored-by: Jenn Nguyen <[email protected]>
* Added Force Torque Noise functions + Unit tests Signed-off-by: Devansh <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Prepare for v9.7.0 Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
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 #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 #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 <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
The IncludeFlatteningNames test added in #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 <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
azeey
approved these changes
Nov 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
sdf10tosdf11I resolved some conflicts and made 3 additional changes in this merge:
IncludeFrameWithSubmodeltest to account for changed support for nested models inlibsdformat11IncludeFlatteningNamestest from Fix flattening logic for nested model names (sdf6) #597 since names are no longer flattened. I also removed the associated model since it was not used anywhere else.sdf/1.7/forcetorque.sdftosdf/1.8/forcetorque.sdfBranch comparison: sdf11...sdf10
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)