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-sim7 ➡️ gz-sim8 #2293

Merged
merged 31 commits into from
Jan 22, 2024
Merged

Merge gz-sim7 ➡️ gz-sim8 #2293

merged 31 commits into from
Jan 22, 2024

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jan 18, 2024

➡️ Forward port

Port gz-sim7 ➡️ gz-sim8

Branch comparison: gz-sim8...gz-sim7

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]>
…zebosim#2176)

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]>
…sh_fix

Backport ActorTrajectoryNoMesh test fix
* 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]>
The light on top of the vehicle was facing the wrong direction

---------

Signed-off-by: Serkan Mazlum <[email protected]>
* Default CMA in LiftDrag pluginto zero

The changes in gazebosim#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](gazebosim#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]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo3 ➡️  ign-gazebo6
The changes in gazebosim#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](gazebosim#2189 (comment)) as to whether the cos term should be cos^2 or cos.


Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Rhys Mainwaring <[email protected]>
Signed-off-by: yaswanth <[email protected]>
Signed-off-by: Yaswanth <[email protected]>
Signed-off-by: yaswanth1701 <[email protected]>
…th Garden and later (gazebosim#2275)

Allows using gz-* in plugin filenames (eg. <plugin filename="gz-sim-physics-system" name="gz::sim::systems::Physics"/>) and using GZ_* environment variables in Fortress. This is meant to help users (especially ROS users) maintain SDF files and launch files that work in both Fortress and Garden/Harmonic.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo6 ➡️  gz-sim7
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Jan 18, 2024
@mjcarroll
Copy link
Contributor

Test failure INTEGRATION_model_photo_shoot_default_joints

@azeey azeey mentioned this pull request Jan 19, 2024
8 tasks
@azeey
Copy link
Contributor Author

azeey commented Jan 19, 2024

Test failure INTEGRATION_model_photo_shoot_default_joints

Fix in #2294

Signed-off-by: Addisu Z. Taddese <[email protected]>
Copy link

codecov bot commented Jan 19, 2024

Codecov Report

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

Comparison is base (cc4914a) 65.79% compared to head (ab18888) 65.75%.

Files Patch % Lines
src/Conversions.cc 14.28% 18 Missing ⚠️
.../systems/environment_preload/EnvironmentPreload.cc 0.00% 7 Missing ⚠️
...c/systems/environment_preload/VisualizationTool.cc 0.00% 3 Missing ⚠️
src/systems/lift_drag/LiftDrag.cc 57.14% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           gz-sim8    #2293      +/-   ##
===========================================
- Coverage    65.79%   65.75%   -0.05%     
===========================================
  Files          327      327              
  Lines        31212    31233      +21     
===========================================
+ Hits         20536    20537       +1     
- Misses       10676    10696      +20     

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

@azeey azeey merged commit a267a68 into gazebosim:gz-sim8 Jan 22, 2024
6 of 10 checks passed
@azeey azeey deleted the 7_to_8 branch January 22, 2024 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants