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

3 ➡️ 4 #410

Merged
merged 55 commits into from
Oct 28, 2020
Merged

3 ➡️ 4 #410

merged 55 commits into from
Oct 28, 2020

Conversation

chapulina
Copy link
Contributor

Forward-port ign-gazebo3 to ign-gazebo4. See comparison:

ign-gazebo4...ign-gazebo3

Needs this PR to be merged and released first: gazebosim/gz-physics#129

iche033 and others added 30 commits August 7, 2020 22:40
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: John Shepherd <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
* initial version of wheel_slip system copied from apply_joint_force

* Port essential parts of WheelSlipPlugin

* Add test init and resolve comments

Signed-off-by: John Shepherd <[email protected]>

* updated tests

Signed-off-by: John Shepherd <[email protected]>

* add tricycle uphill test

Signed-off-by: John Shepherd <[email protected]>

* Add partial tire drum test

Signed-off-by: John Shepherd <[email protected]>

* Add triball drift sdf

Signed-off-by: John Shepherd <[email protected]>

* Sdf changes

Signed-off-by: John Shepherd <[email protected]>

* initial version of wheel_slip system copied from apply_joint_force

* Port essential parts of WheelSlipPlugin

* Add test init and resolve comments

Signed-off-by: John Shepherd <[email protected]>

* updated tests

Signed-off-by: John Shepherd <[email protected]>

* add tricycle uphill test

Signed-off-by: John Shepherd <[email protected]>

* Add partial tire drum test

Signed-off-by: John Shepherd <[email protected]>

* Add triball drift sdf

Signed-off-by: John Shepherd <[email protected]>

* Sdf changes

Signed-off-by: John Shepherd <[email protected]>

* requested fixes

Signed-off-by: John Shepherd <[email protected]>

* Add suggestions, make codecheck happy

Signed-off-by: John Shepherd <[email protected]>

* Add test fixes

Signed-off-by: John Shepherd <[email protected]>

* Requested fixes

Signed-off-by: John Shepherd <[email protected]>

* Add suggested fixes

Signed-off-by: John Shepherd <[email protected]>

* Update src/systems/wheel_slip/WheelSlip.cc

Co-authored-by: Addisu Z. Taddese <[email protected]>

Co-authored-by: Steve Peters <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: John Shepherd <[email protected]>
A recent update to DART changed the way the slip parameter is
implemented. Part of this change removed the small amount of slip each
surface had by default. This in turn broke this test because the vehicle
would not steer as some amount of slip is needed in the lateral
direction. The solution is to lower the coefficient of friction in the
lateral direction so the friction in that direction can be overcome by
the steering force.

Signed-off-by: Addisu Z. Taddese <[email protected]>
* enhanced log playback performance

Signed-off-by: Ashton Larkin <[email protected]>

* Handling multiple Parse(...) calls in a single Update

Signed-off-by: Ashton Larkin <[email protected]>

* Change clear behavior

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

* Revert changes

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

* explain cached pose clearing behavior

Signed-off-by: Ashton Larkin <[email protected]>

* fixed whitespacing for codecheck

Signed-off-by: Ashton Larkin <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
* 2.25.0

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

* Added missing PR

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

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: John Shepherd <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: John Shepherd <[email protected]>
Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Oct 14, 2020
@chapulina chapulina marked this pull request as draft October 14, 2020 18:52
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🔮 dome Ignition Dome labels Oct 14, 2020
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Oct 19, 2020
@chapulina
Copy link
Contributor Author

ign-physics 3.1.0 is out, this should be unblocked.

@chapulina chapulina marked this pull request as ready for review October 19, 2020 17:20
@chapulina chapulina self-assigned this Oct 19, 2020
@codecov
Copy link

codecov bot commented Oct 19, 2020

Codecov Report

Merging #410 into ign-gazebo4 will increase coverage by 0.01%.
The diff coverage is 73.50%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo4     #410      +/-   ##
===============================================
+ Coverage        77.19%   77.21%   +0.01%     
===============================================
  Files              200      203       +3     
  Lines            10709    10963     +254     
===============================================
+ Hits              8267     8465     +198     
- Misses            2442     2498      +56     
Impacted Files Coverage Δ
include/ignition/gazebo/Link.hh 100.00% <ø> (ø)
include/ignition/gazebo/Model.hh 100.00% <ø> (ø)
include/ignition/gazebo/SdfEntityCreator.hh 100.00% <ø> (ø)
include/ignition/gazebo/ServerConfig.hh 100.00% <ø> (ø)
...e/ignition/gazebo/components/AngularVelocityCmd.hh 100.00% <ø> (ø)
...de/ignition/gazebo/components/LinearVelocityCmd.hh 100.00% <ø> (ø)
.../plugins/component_inspector/ComponentInspector.hh 28.57% <ø> (ø)
src/gui/plugins/entity_tree/EntityTree.cc 9.89% <0.00%> (-0.52%) ⬇️
src/gui/plugins/entity_tree/EntityTree.hh 100.00% <ø> (ø)
src/gui/plugins/shapes/Shapes.cc 31.25% <0.00%> (ø)
... and 58 more

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 53f7bdb...0ab6d35. Read the comment docs.

@chapulina
Copy link
Contributor Author

@osrf-jenkins run tests please

Copy link
Contributor

@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.

Looks like the changes in #314 to fix the diff drive tests are not compatible with the changes in #357. Reverting the changes in test/integration/diff_drive_system.cc from #314 fixes the test for me locally.

Changelog.md Show resolved Hide resolved
@chapulina
Copy link
Contributor Author

Reverting the changes in test/integration/diff_drive_system.cc from #314 fixes the test for me locally.

Thanks for figuring this out, @azeey. The test was failing locally for me and I was thinking I had the wrong DART version.

Reverted in 0ab6d35 and confirmed that the test is fixed for me locally 👍

@chapulina chapulina requested a review from azeey October 26, 2020 18:49
@chapulina chapulina merged commit 6f32258 into ign-gazebo4 Oct 28, 2020
@chapulina chapulina deleted the chapulina/3_to_4 branch October 28, 2020 18:45
@adlarkin adlarkin mentioned this pull request Dec 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants