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.

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

6 ➡️ 7 (main) #1236

Merged
merged 13 commits into from
Dec 8, 2021
Merged

6 ➡️ 7 (main) #1236

merged 13 commits into from
Dec 8, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo6 to main

Branch comparison: main...ign-gazebo6

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

arjo129 and others added 13 commits November 16, 2021 20:02
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Fix buoyancy not being applied for one iteration
* update more model properties and add code to update link properties

Signed-off-by: Ian Chen <[email protected]>

* update sensors, and add test

Signed-off-by: Ian Chen <[email protected]>

* Suggestion to #1170

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

* update to use new api

Signed-off-by: Ian Chen <[email protected]>

* use updated api

Signed-off-by: Ian Chen <[email protected]>

* require sdf 12.2

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

* Update SdfGenerator to save light data to file (#1209)

* save lights

Signed-off-by: Ian Chen <[email protected]>

* fix doc

Signed-off-by: Ian Chen <[email protected]>

* use updated api

Signed-off-by: Ian Chen <[email protected]>

* Update SdfGenerator to save joint data to file (#1220)

* save joints

Signed-off-by: Ian Chen <[email protected]>

* use joinPaths

Signed-off-by: Ian Chen <[email protected]>

* Only output thread_pitch for screw joints

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

Co-authored-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Fix test

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

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Dec 6, 2021
@codecov
Copy link

codecov bot commented Dec 6, 2021

Codecov Report

Merging #1236 (d53dcaa) into main (080bde1) will increase coverage by 0.37%.
The diff coverage is 86.55%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1236      +/-   ##
==========================================
+ Coverage   61.88%   62.25%   +0.37%     
==========================================
  Files         274      275       +1     
  Lines       22446    22715     +269     
==========================================
+ Hits        13890    14142     +252     
- Misses       8556     8573      +17     
Impacted Files Coverage Δ
include/ignition/gazebo/gui/GuiEvents.hh 0.00% <ø> (ø)
src/gui/plugins/entity_tree/EntityTree.cc 8.06% <ø> (ø)
src/gui/plugins/scene_manager/GzSceneManager.cc 33.33% <0.00%> (-4.91%) ⬇️
src/gui/plugins/select_entities/SelectEntities.cc 10.09% <0.00%> (ø)
src/SdfGenerator.cc 90.95% <88.62%> (-3.92%) ⬇️
src/gui/GuiEvents.cc 100.00% <100.00%> (ø)
src/systems/buoyancy/Buoyancy.cc 83.01% <100.00%> (ø)
src/systems/force_torque/ForceTorque.cc 73.72% <100.00%> (ø)
src/SdfEntityCreator.cc 85.82% <0.00%> (+1.99%) ⬆️

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 080bde1...d53dcaa. Read the comment docs.

@chapulina chapulina merged commit 18fa604 into main Dec 8, 2021
@chapulina chapulina deleted the chapulina/6_to_7 branch December 8, 2021 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants