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 #2422

Merged
merged 20 commits into from
May 31, 2024
Merged

Merge gz-sim8 ➡️ main #2422

merged 20 commits into from
May 31, 2024

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)

quarkytale and others added 20 commits March 26, 2024 08:29
* test script tag

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* add dark grey before creating component

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* material parser

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* linters

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* Update src/rendering/MaterialParser/MaterialParser.cc

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Dharini Dutia <dharinidutia@gmail.com>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* fix configLoader, material struct and feedback

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* default color and todos

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* install/load one file, range based loop, hardcode dependent solid colors

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* fix install_dir property

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* credits, initializing cleanup

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* eof

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* reformat

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* add integration test

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* migration note

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* intends, default case, invalid color

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* optional materialValues, typo

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* feedback

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* size check

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* get color values

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

* migration doc update

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>

---------

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
Signed-off-by: Dharini Dutia <dharinidutia@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Edited gazebo.material file to remove multiple passes in solid colors.
Refactored the parser based on Gazebo's style guide.

Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
Signed-off-by: Dharini Dutia <dharinidutia@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
The failures are caused by a change in the DART physics engine
(dartsim/dart#1774) which causes joints to
recover after reaching or exceeding their position limits. It seems like
the model used in this plugin starts off with joint limits violated and
recovers after a few iterations. This causes a small movement of the
robot. Since the test works by comparing images taken of the robot at
the start of simulation and after a few iterations, the small movement
causes a discrepancy in the images. The solution here is to run the
whole test while simulation is paused.

This also cleans up some TestFixture warnings.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-gazebo6 ➡️  gz-sim7
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
The package name has an underscore between `fuel` and `tools`.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
* Use latest 1.14 google-test in gtest_setup

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Make gcc happy about dangling pointer

GCC is emitting a warning about a possible danling pointer on table
like definitions:

warning: possibly dangling reference to a temporary [-Wdangling-reference]
  660 |         auto const& table = get_current_events_table(state_indexes{});
      |                     ^~~~~

Which I think that really comes from the use of state_indexes{} as
argument:

  note: the temporary was destroyed at the end of the full expression
  660 |         auto const& table = get_current_events_table(state_indexes{});
      |                             ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~

Clang is quiet about this and make me think that is a false positive
since the metaprogramming code is using just the type of the state_indexes
as much as I can see.

---------

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
The test in this file does nothing. We should remove it.

Signed-off-by: Arjo Chakravarty <arjoc@google.com>
This adds the dynamics to simulate a lighter-than-air vehicle such as blimps/airships. The modelling is  based on [1] and [2]. Previously we added an airship-dynamics-plugin to Gazebo-Classic for [PX4 Gazebo SITL](PX4/PX4-SITL_gazebo-classic#490) , but we suffered simulation instability similar to that of the underwater-vehicles since Gazebo-Classic could not simulate the Added Mass dynamics.

This PR brings that airship-dynamics-plugin to Gazebo which supports the Added Mass dynamics.

Furthermore, I have extended, the Link class to provide access to the AddedMassMatrix, to allow the lighter-than-air system to easily access this matrix. 

The code is somewhat based of the Hydrodynamics system. 

I have an STL file which I can contribute, which is an envelope from [Wind Reiter](https://www.windreiter.com/shop/sb-324-300/), and the coefficients in the integrations test is for this envelope model.

### Citations
[1] Li, Y., & Nahon, M. (2007). Modeling and simulation of airship dynamics.  Journal of Guidance, Control, and Dynamics, 30(6), 1691–1700.
[2] Li, Y., Nahon, M., & Sharf, I. (2011). Airship dynamics modeling: A literature review. Progress in Aerospace Sciences, 47(3), 217–239.


Signed-off-by: henrykotze <henry@flycloudline.com>
This adds some comments and uses structured bindings
in range-based for loops to improve readability.
It also adds const to unmodified variables in a loop.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jenn Nguyen <jenn.nguyen02@gmail.com>
Needed due to use of std::find_if.

Signed-off-by: Øystein Sture <oysstu@users.noreply.github.com>
)

Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>
* Fix Cmake warnings

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>

* Move new argument above URL to fix issue with older cmake

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

---------

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label May 29, 2024
@scpeters
Copy link
Member Author

requires gazebosim/gz-msgs#445

@scpeters
Copy link
Member Author

CI looks ok now that gazebosim/gz-msgs#445 has been merged, aside from a failure of INTEGRATION_mesh_inertia_calculation, which appears to be flaky on the main branch:

@iche033 iche033 merged commit 6ab114f into main May 31, 2024
7 of 8 checks passed
@iche033 iche033 deleted the scpeters/merge_8_main branch May 31, 2024 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet