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

Merge gz-sim8 ➡️ main #2244

Merged
merged 29 commits into from
Nov 15, 2023
Merged

Merge gz-sim8 ➡️ main #2244

merged 29 commits into from
Nov 15, 2023

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-sim8 ➡️ main

Branch comparison: main...gz-sim8

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

arjo129 and others added 28 commits October 3, 2023 08:54
* Fix enviroment system loading mechanism

Currently, there is an issue with the way the Environment loader plugin loads data. In particular it directly writes to the ECM. While this makes sense intuitively, it does not work in practice as the GUI runs on a client process while systems that use it run on the server. This PR fixes this issue by introducing a topic through which the GUI may load Environment Data on the server.

Signed-off-by: Arjo Chakravarty <[email protected]>

* small changes

Signed-off-by: Arjo Chakravarty <[email protected]>

* Working on porting the visuals

Signed-off-by: Arjo Chakravarty <[email protected]>

* Actually send message for loading from ui to environment preload plugin.

Visuallization still goes 💥

Signed-off-by: Arjo Chakravarty <[email protected]>

* Rewrite EnvironmentVisualization Widget to be simpler.

Signed-off-by: Arjo Chakravarty <[email protected]>

* fix crashes.

Vis still not working

Signed-off-by: Arjo Chakravarty <[email protected]>

* Get a different 💥

Signed-off-by: Arjo Chakravarty <[email protected]>

* Works some times.

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fixed synchronization issues.

Now left with one more crash that needs debugging when "play" is hit.

Signed-off-by: Arjo Chakravarty <[email protected]>

* No more 💥s 🎉

Signed-off-by: Arjo Chakravarty <[email protected]>

* style

Signed-off-by: Arjo Chakravarty <[email protected]>

* Sprinkled with healthy dose of Doxygen

Also refactored the visualization tool out.

Signed-off-by: Arjo Chakravarty <[email protected]>

* Style

Signed-off-by: Arjo Chakravarty <[email protected]>

* More style fixes

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fix Typo with unit map

Signed-off-by: Arjo Chakravarty <[email protected]>

* Address PR feedback

Signed-off-by: Arjo Chakravarty <[email protected]>

* Style fixes

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fix incorrect use of path.

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fix example loading issues.

Signed-off-by: Arjo Chakravarty <[email protected]>

* style

Signed-off-by: Arjo Chakravarty <[email protected]>

* Update src/systems/environment_preload/VisualizationTool.cc

Co-authored-by: Mabel Zhang <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>

* Adds a warning regarding loading plugins.

Signed-off-by: Arjo Chakravarty <[email protected]>

* Automatically loads plugin if missing

This commit automatically loads the environment preload plugin if it is
missing.

Signed-off-by: Arjo Chakravarty <[email protected]>

* Address some feedback I missed

Signed-off-by: Arjo Chakravarty <[email protected]>

* Address some feedback

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fixes issue  described by @iche033.

However fix depends on gazebosim/gz-math#551

Signed-off-by: Arjo Chakravarty <[email protected]>

* style

Signed-off-by: Arjo Chakravarty <[email protected]>

* Fixed failing tests

Signed-off-by: Arjo Chakravarty <[email protected]>

---------

Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Voldivh <[email protected]>
# Summary
This is a plugin that ports the behaviour of the advanced lift drag plugin that was present in Gazebo Classic to Gazebo. The physics implementation have not changed, but the plugin has been adapted to work with the entity component system. Primary modeling differences in the advanced_lift_drag plugin from the original liftdrag_plugin include:

- quadratic formulation for drag 
- side force
- flat-plate post-stall model
- aerodynamic moments about all three axes
- body rate stability derivatives
- actuator control derivatives

The objective is to provide a more accurate model of a wing than what is provided in the basic lift drag plugin.

Signed-off-by: frederik <[email protected]>
Signed-off-by: Frederik Markus <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Co-authored-by: frederik <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Implements a method to get the link inertia
Signed-off-by: Michael Carroll <[email protected]>
Closes #2153

Signed-off-by: Michael Carroll <[email protected]>
* standardize system parameter doxygen for plugins O-Z
* 80 chars
* Update TrackedVehicle.hh
* fix lint
* gcc warning about multi-line comment
Signed-off-by: Mabel Zhang <[email protected]>
Merge gz-sim7 ➡️  gz-sim8
* wind addition to advanced_lift_drag plugin

Signed-off-by: frederik <[email protected]>

* added note on wind

Signed-off-by: frederik <[email protected]>

---------

Signed-off-by: frederik <[email protected]>
Co-authored-by: frederik <[email protected]>
Several systems use const_cast in order to call
sdf::Element::GetElement with const ElementPtrs,
but the FindElement API can be used instead.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Attention: 159 lines in your changes are missing coverage. Please review.

Comparison is base (efc3bed) 65.90% compared to head (ae75c25) 65.66%.

❗ Current head ae75c25 differs from pull request most recent head 734977a. Consider uploading reports for the commit 734977a to get more accurate results

Files Patch % Lines
...c/systems/environment_preload/VisualizationTool.cc 2.54% 115 Missing ⚠️
.../systems/environment_preload/EnvironmentPreload.cc 62.37% 38 Missing ⚠️
src/systems/sensors/Sensors.cc 85.71% 3 Missing ⚠️
src/systems/lift_drag/LiftDrag.cc 86.66% 2 Missing ⚠️
python/src/gz/sim/Link.cc 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2244      +/-   ##
==========================================
- Coverage   65.90%   65.66%   -0.25%     
==========================================
  Files         323      324       +1     
  Lines       30713    30938     +225     
==========================================
+ Hits        20241    20315      +74     
- Misses      10472    10623     +151     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -20,7 +20,7 @@ include(FetchContent)
FetchContent_Declare(
sensors_clone
GIT_REPOSITORY https:/gazebosim/gz-sensors
GIT_TAG main
GIT_TAG gz-sensors8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to change this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed with force push to 734977a

@scpeters
Copy link
Member Author

build failing; needs a forward port of gazebosim/gz-math#551

@scpeters
Copy link
Member Author

build failing; needs a forward port of gazebosim/gz-math#551

gazebosim/gz-math#570

@mjcarroll
Copy link
Contributor

@osrf-jenkins retest this please

@scpeters
Copy link
Member Author

I'll rebuild the gz-math nightly and then run CI again

@scpeters
Copy link
Member Author

with the new nightly things are better; CI is as good as it's going to get without disabling tests

@scpeters scpeters merged commit 9f21c6e into main Nov 15, 2023
5 of 7 checks passed
@scpeters scpeters deleted the scpeters/merge_8_main branch November 15, 2023 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants