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 8 -> main #2334

Merged
merged 58 commits into from
Apr 1, 2024
Merged

Merge 8 -> main #2334

merged 58 commits into from
Apr 1, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Mar 13, 2024

➡️ Forward port

Port gz-sim8 to main

Branch comparison: main...gz-sim8

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

azeey and others added 30 commits October 3, 2023 18:38
The Fuel model being tested has been updated on the Fuel server tests
fail without this fix.

Signed-off-by: Addisu Z. Taddese <[email protected]>
…des test

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo3 ➡️  ign-gazebo6
Signed-off-by: Ian Chen <[email protected]>
)

Signed-off-by: ashbabu <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Backport ActorTrajectoryNoMesh test fix
…InertiaCalculator::CalculateMassProperties()` function (#2182)

* Added function to transform inertia matrix to COM using parallel axis theorem
* Corrected mismatch of values in ixz and iyz calculation from integral
* Added doc for TransformInertiaMatrixToCOM() function
* Added correction for rotational offset of inertia matrix after transformation
* Added cylinder with origin at bottom to test world
* Fixed center of mass & inertia matrix calculation in CalculateMassProperties()
* Added test for inertia calculation of cylinder with origin at the bottom
* Updated input params of TransformInertiaMatrixToCOM() to const ref
* Updated tutorial doc
* Removed unused functions from the code


---------

Signed-off-by: Jasmeet Singh <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Use the Mecanum wheel meshes from the "Mecanum lift"
model on Gazebo Fuel in the mecanum_drive example world.

Signed-off-by: Steve Peters <[email protected]>
)

* Temporary fix for #2165 until #2217 is resolved.

Signed-off-by: Johan Rutgeerts <[email protected]>

* Added comment to clarify the added code.

Signed-off-by: Johan Rutgeerts <[email protected]>

---------

Signed-off-by: Johan Rutgeerts <[email protected]>
The light on top of the vehicle was facing the wrong direction

---------

Signed-off-by: Serkan Mazlum <[email protected]>
* Adding maritime tutorials.

Signed-off-by: Carlos Agüero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: crvogt <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Buoyancy and hydrodynamics tutorials.

Signed-off-by: Carlos Agüero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: crvogt <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Lander and lrauv tutorials.

Signed-off-by: Carlos Agüero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: crvogt <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Adding a maritime surface vehicle tutorial.
---------

Signed-off-by: Carlos Agüero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: crvogt <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Default CMA in LiftDrag pluginto zero

The changes in #2189 have caused a regression for our upstream users.
This fix disables moment calculations by defaulting Cma to zero. It
should help mitigate some of the regression. There is also an [ongoing
discussion](#2189 (comment)) as to whether the cos term should be cos^2 or cos.

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

* remove cos change to address one problem at a time

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

---------

Signed-off-by: Arjo Chakravarty <[email protected]>
Occurs when using USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION flag.

Signed-off-by: Øystein Sture <[email protected]>
azeey and others added 14 commits January 22, 2024 10:24
Merge gz-sim7 ➡️  gz-sim8
This change allows for a simpler mapping from `MaterialColor` msg in gz to the much more cumbersome Visual msg. By doing this and adding a topic listener it allows users to rapidly change the colors of a entities visual material color components, including from the [ROS side using the gz bridge](gazebosim/ros_gz#486). This is especially useful for simulating status lighting.


---------

Signed-off-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Loading the rendering pipeline multiple times in a test doesn't seem to
work well. This removes the Sensors system from the `non_rendering_sensors.sdf`
file so that Ogre2 and the whole rendering pipeline is only loaded once.

Signed-off-by: Addisu Z. Taddese <[email protected]>
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 <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Alessandro Croci <[email protected]>
Until SystemManager has the ability to unload system plugins, plugins require an explicit check of the validity of the entities used in the Update methods. Such a check was missing in OdometryPublisher, which led to non-critical but annoying errors in the console.
---------

Signed-off-by: Anton Bogdanov <[email protected]>
* Fix wget in maritime tutorials.

Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Mar 13, 2024
@iche033 iche033 changed the title Merge 8 main 20240313 Merge 8 -> main Mar 13, 2024
Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor Author

iche033 commented Mar 14, 2024

depends on gazebosim/gz-msgs#430

@iche033
Copy link
Contributor Author

iche033 commented Mar 16, 2024

The INTEGRATION_triggered_publisher test is failing because it's receiving more msgs than expected. The test also just started failing on main (failing build). It's likely due to gazebosim/gz-transport#479. If I revert to a gz-transport commit before the merge forward in gz-transport, the test passes.

Interestingly if I run just that problematic test by itself, it passes:

./build/gz-sim9/bin/INTEGRATION_triggered_publisher --gtest_filter="*InputMessagesTriggerServices*"

I think it could be that the test is getting msgs from previous test that uses the same topic name, cc @caguero

Not sure if we should fix the test here or if this exposes an issue in gz-transport

Edit: found the PR that cause the test to fail: gazebosim/gz-transport#470. I think gz-transport is doing what it's supposed to do.

@azeey
Copy link
Contributor

azeey commented Mar 16, 2024

I also noticed this and went down a rabbit hole. It turns out gz::transport:NodeShared in gz-transport is never destroyed. I thought when all the gz::transport::Node were destroyed, NodeShared would be destroyed as well, but this is not the case, so there is a good chance for tests to interfere with each other. I've worked on a potential solution: gazebosim/gz-transport@gz-transport13...azeey:gz-transport:shared_ptr_for_nodeshared It fixes INTEGRATION_triggered_publisher for me.

@azeey
Copy link
Contributor

azeey commented Mar 21, 2024

INTEGRATION_triggered_publisher is also failing on gz-sim8 now (cc @claraberendsen). I'm fairly happy with gazebosim/gz-transport#484, but we probably need a few eyes on it.

@iche033
Copy link
Contributor Author

iche033 commented Mar 29, 2024

I think the gz-transport issue may take some time to fix. Can we get this in first?

@iche033 iche033 merged commit 250c939 into main Apr 1, 2024
3 of 6 checks passed
@iche033 iche033 deleted the merge_8_main_20240313 branch April 1, 2024 20:08
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.