Skip to content

6 ➡️ 9#738

Merged
azeey merged 19 commits intosdf9from
chapulina/6_to_9
Nov 8, 2021
Merged

6 ➡️ 9#738
azeey merged 19 commits intosdf9from
chapulina/6_to_9

Conversation

@chapulina
Copy link
Copy Markdown
Contributor

➡️ Forward port

Port sdf6 to sdf9

Branch comparison: sdf9...sdf6

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

chapulina and others added 15 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: Louise Poubel <louise@openrobotics.org>
@github-actions github-actions bot added Gazebo 1️1️ Dependency of Gazebo classic version 11 🏰 citadel Ignition Citadel labels Oct 30, 2021
@chapulina chapulina requested review from azeey and scpeters October 30, 2021 01:12
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Copy Markdown
Member

scpeters commented Nov 5, 2021

I also fixed a compilation error in 331ea53

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Nov 6, 2021

Codecov Report

Merging #738 (38be09c) into sdf9 (f805c95) will increase coverage by 0.64%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             sdf9     #738      +/-   ##
==========================================
+ Coverage   86.82%   87.46%   +0.64%     
==========================================
  Files          63       63              
  Lines        9897     9893       -4     
==========================================
+ Hits         8593     8653      +60     
+ Misses       1304     1240      -64     
Impacted Files Coverage Δ
src/parser.cc 77.91% <100.00%> (+0.09%) ⬆️
src/parser_urdf.cc 83.25% <100.00%> (+3.89%) ⬆️
include/sdf/Param.hh 75.80% <0.00%> (+1.61%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f805c95...38be09c. Read the comment docs.

@nkoenig
Copy link
Copy Markdown
Contributor

nkoenig commented Nov 8, 2021

Thanks @scpeters and @azeey. CI looks green now.

@scpeters scpeters requested a review from azeey November 8, 2021 19:17
@chapulina
Copy link
Copy Markdown
Contributor Author

Thanks for sorting it out, @scpeters ! I'll wait for @azeey 's approval

@azeey azeey merged commit 1a05444 into sdf9 Nov 8, 2021
@azeey azeey deleted the chapulina/6_to_9 branch November 8, 2021 22:43
@chapulina chapulina mentioned this pull request Apr 27, 2022
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏰 citadel Ignition Citadel Gazebo 1️1️ Dependency of Gazebo classic version 11

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants