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

10 to 11 20210412 #539

Merged
merged 5 commits into from
Apr 21, 2021
Merged

10 to 11 20210412 #539

merged 5 commits into from
Apr 21, 2021

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Apr 12, 2021

➡️ Forward port

Port sdf10 to sdf11

Branch comparison: sdf11...sdf10

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

nkoenig and others added 4 commits April 6, 2021 07:57
@nkoenig @caguero
Particle emitter (#528)
dc3d100 
* Adding particle emitter to SDF

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

* missing files

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

* Update documentation

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

* Update documentation and clamps

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

* Minor tweaks.

Signed-off-by: Carlos Agüero <[email protected]>

* Fix windows warnings and scale rate default

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

* Use empty string for topic and image path

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

* Fix more windows warnings

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
@peci1 @nkoenig
Fixed application of <sensor><pose> tags in lumped linkes during URDF…
87a4992 
… conversion (#525)

* Fixed application of <sensor><pose> tags in lumped linkes during URDF conversion.

Fixed <projector>, too.

Signed-off-by: Martin Pecka <[email protected]>

* Changelog

Signed-off-by: Martin Pecka <[email protected]>

* Fixed float equality in test.

Signed-off-by: Martin Pecka <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
@nkoenig
10.4.0 prep (#534)
f310d75 
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Forward port sdf10 to sdf11
8621f25 
Signed-off-by: Nate Koenig <[email protected]>
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🏯 fortress Ignition Fortress labels Apr 12, 2021
@nkoenig nkoenig mentioned this pull request Apr 12, 2021
Merged
@chapulina
Copy link
Contributor

The build is broken:

/var/lib/jenkins/workspace/sdformat-ci-pr_any-ubuntu_auto-amd64/sdformat/src/Link.cc: In member function ���void sdf::v11::Link::SetPoseRelativeToGraph(sdf::v11::ScopedGraph<sdf::v11::PoseRelativeToGraph>)���:
/var/lib/jenkins/workspace/sdformat-ci-pr_any-ubuntu_auto-amd64/sdformat/src/Link.cc:429:42: error: no matching function for call to ���sdf::v11::ParticleEmitter::SetPoseRelativeToGraph(sdf::v11::ScopedGraph<sdf::v11::PoseRelativeToGraph>&)���
     emitter.SetPoseRelativeToGraph(_graph);
                                          ^

@chapulina chapulina mentioned this pull request Apr 13, 2021
Merged
7 tasks
azeey
azeey reviewed Apr 15, 2021
View reviewed changes
include/sdf/ParticleEmitter.hh Outdated Show resolved Hide resolved
include/sdf/ParticleEmitter.hh Outdated Show resolved Hide resolved
include/sdf/ParticleEmitter.hh Outdated Show resolved Hide resolved
sdf/1.8/link.sdf Show resolved Hide resolved
src/ParticleEmitter.cc Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2021 •
edited
Loading

Codecov Report

Merging #539 (da2e2b7) into sdf11 (b9971ff) will decrease coverage by 0.19%.
The diff coverage is 78.21%.

❗ Current head da2e2b7 differs from pull request most recent head 7dfcd4e. Consider uploading reports for the commit 7dfcd4e to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##            sdf11     #539      +/-   ##
==========================================
- Coverage   87.65%   87.46%   -0.20%     
==========================================
  Files          71       72       +1     
  Lines       10104    10349     +245     
==========================================
+ Hits         8857     9052     +195     
- Misses       1247     1297      +50
Impacted Files Coverage Δ
src/parser_urdf.cc 78.32% <44.44%> (-1.12%) ⬇️
src/Link.cc 95.55% <81.81%> (-1.92%) ⬇️
src/ParticleEmitter.cc 90.11% <90.11%> (ø)

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 b9971ff...7dfcd4e. Read the comment docs.

@scpeters
Copy link
Member

since we will use "Merge" for this PR, we should squash the commits about fixing the build

@scpeters
Update to latest SDF semantics
7dfcd4e 
* Copy particle_emitter.sdf to sdf/1.8
* Use IMPLPtr in ParticleEmitter DOM class
* Update frame semantics

Signed-off-by: Nate Koenig <[email protected]>
@scpeters scpeters force-pushed the 10-to-11-20210412 branch from cd81dff to 7dfcd4e Compare April 19, 2021 23:57
@scpeters
Copy link
Member

since we will use "Merge" for this PR, we should squash the commits about fixing the build

I squashed all the changes after the merge into 7dfcd4e

@nkoenig
Copy link
Contributor Author

nkoenig commented Apr 19, 2021

since we will use "Merge" for this PR, we should squash the commits about fixing the build

I've never been able to successfully squash commits. I'll decline this one and create a clean branch.

@nkoenig nkoenig closed this Apr 19, 2021
@scpeters
Copy link
Member

I had just squashed it, so I think we can use that

@scpeters scpeters reopened this Apr 19, 2021
azeey
azeey approved these changes Apr 20, 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 with green CI

@chapulina chapulina removed the 🏯 fortress Ignition Fortress label Apr 20, 2021
@scpeters scpeters merged commit 25004f0 into sdf11 Apr 21, 2021
@scpeters scpeters deleted the 10-to-11-20210412 branch April 21, 2021 16:50
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

Assignees
No one assigned
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nkoenig @chapulina @codecov-commenter @scpeters @azeey @peci1