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

port: 6 to 7 20221111 #1794

Merged
merged 32 commits into from
Nov 28, 2022
Merged

port: 6 to 7 20221111 #1794

merged 32 commits into from
Nov 28, 2022

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Nov 12, 2022

➡️ Forward port

Port ign-gazebo6 to gz-sim7.

Most of the changes are ign->gz naming updates. Here is a list of files that contain changes other changes:

  1. Changelog.md
  2. examples/worlds/tunnel.sdf
  3. src/systems/rf_comms/RFComms.cc
  4. test/integration/hydrodynamics.cc
  5. test/worlds/hydrodynamics.sdf

@azeey and/or @scpeters can you take a look at the Physics system. I combined the merge, which I think is making the tests upset.

@caguero , can you give the thruster changes a look?

Branch comparison: https://github.com/gazebosim//compare/<TO_BRANCH>...<FROM_BRANCH>

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

caguero and others added 27 commits August 31, 2022 00:24
* Add topic parameter.

Signed-off-by: Carlos Agüero <[email protected]>
* bumped minor and updated changelog

Signed-off-by: Dharini Dutia <[email protected]>

* fixed changelog as per feedback and updated migration guide

Signed-off-by: Dharini Dutia <[email protected]>

Signed-off-by: Dharini Dutia <[email protected]>
* initial commit to allow plugin to call a service

Signed-off-by: Liam Han <[email protected]>

* adding tutorial and modifying the world sdf

Signed-off-by: Liam Han <[email protected]>

* added test for single input and single service output

Signed-off-by: Liam Han <[email protected]>

* added test for single input and multiple service output

Signed-off-by: Liam Han <[email protected]>

* added test for invalid matching service name => timeout

Signed-off-by: Liam Han <[email protected]>

* modified variables the camelCase

Signed-off-by: Liam Han <[email protected]>

* fixed typo, indentation, grammar, lines that exceeded 80 char

Signed-off-by: Liam Han <[email protected]>

* fixing ubuntu bionic ci issue

Signed-off-by: Liam Han <[email protected]>

* silly syntax mistake on expect_eq

Signed-off-by: Liam Han <[email protected]>

* added three more test cases that addesses incorrect response type, incorrect request type and false result

Signed-off-by: Liam Han <[email protected]>

* WIP: major restructuring and currently working. Requires more cleanup and test

Signed-off-by: Liam Han <[email protected]>

* WIP: fixed preprocessor define bug

Signed-off-by: Liam Han <[email protected]>

* WIP: working but extremely convoluted

Signed-off-by: Liam Han <[email protected]>

* WIP major modification but a lot of errors and tests failed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* modified to use blocking Request method as well as reduce a service worker thread to just one thread with the publisher. all tests passed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* successfully reverted and tested

Signed-off-by: Liam Han <[email protected]>

* fixing PR suggestions

Signed-off-by: Liam Han <[email protected]>

* changed string with 'serv' to 'srv' and included <mutex> to the header

Signed-off-by: Liam Han <[email protected]>

* fixed indentation and removed rep.set_data since it's unused on the client service

Signed-off-by: Liam Han <[email protected]>

* getting rid of the id

Signed-off-by: Liam Han <[email protected]>

* fixed race condition resulting seldom test failure

Signed-off-by: Liam Han <[email protected]>

* changed from triggerSrv to serviceCount. This compensates for the two threads running at different rate

Signed-off-by: Liam Han <[email protected]>

* braces indentation

Signed-off-by: Mabel Zhang <[email protected]>

* addressing gnu c compiler (gcc) warnings

Signed-off-by: Liam Han <[email protected]>

Signed-off-by: Liam Han <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>
Allows for inheriting model name for robotNamespace when SDF element is not set and provides a debug message showing the topics it subscribes to.

Signed-off-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Add an example file for the ResourceSpawner plugin. I'm using this to link from https://github.com/gazebosim/docs/blob/master/garden/Model_insertion_fuel.md. To improve gazebosim/garden-tutorial-party#1991.

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
found a silly typo that was pushed back in PR (#1611)
* Adds sky cubemap URI to the sky.proto's header

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

* require sdf 12.6

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

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
* Adds sky cubemap URI to the sky.proto's header

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

* Return absolute path when finding a resource

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

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
* cherry pick aef3020

Signed-off-by: Ian Chen <[email protected]>
* adding thrust coefficient calculation

Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.hh

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* thrust coefficient test and behavior updates

Signed-off-by: Marco A. Gutierrez <[email protected]>

* making float comparision more robust

Signed-off-by: Marco A. Gutierrez <[email protected]>

* fix float comparision and lint

Signed-off-by: Marco A. Gutierrez <[email protected]>

Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
This commit enables and disables individual components of the hydrodynamics. This is often useful for debugging odd behaviours of a hydrodynamic model.
* Fortress: Removed warnings
* Enable use of ign gazebo -s on Windows

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

* Update src/CMakeLists.txt

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Silvio <[email protected]>

* Fix cmdmodel6.rb and cmdgazebo6.rb contining the same code

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

Signed-off-by: Silvio <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

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

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
This commit changes the url to use the more recent url. It also removes the scene-broadcaster plugin as we don't need it in the test itself.

Signed-off-by: Arjo Chakravarty <[email protected]>
* 🎈 3.14.0~pre1 (#1650)

Signed-off-by: Louise Poubel <[email protected]>

* Remove redundant namespace references (#1635)

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

* 🎈 3.14.0 (#1657)

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

* readd namespaces for Q_ARGS (#1670)

* Remove actors from screen when they are supposed to (#1699)

# 🦟 Bug fix

Supercedes #1697.  Note: When forward porting we will have to update the hashmaps to erase the new hashmaps created.

Fixes #<NUMBER>

## Summary
Found that when actors are De-spawned the actor visuals are not destroyed. This commit addresses this bug by adding the missing remove logic in RenderUtils.

## Before
![bug](https://user-images.githubusercontent.com/542272/189558600-196d98c5-1dcf-4d6c-93d6-7493df38c0e4.gif)

## After
![no_bug](https://user-images.githubusercontent.com/542272/189558924-3f2e3c5d-68f3-4d80-aee4-3dc3ce6742a1.gif)

## Notes:
Theres a lot of hashmaps being populated in RenderUtils whenever a new actor is spawned. I hope I've caught them all. 
Also while I need these working in garden (as all the projects Im working on use garden), should I backport these changes?

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

* Update examples to use gazebosim.org

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

* Citadel: Removed warnings (#1753)

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

* Added collection name to About Dialog (#1756)

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

* Convert ignitionrobotics to gazebosim in tests directory (#1757)

* Convert ignitionrobotics to gaazebosim in tests directory

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

* fix gz-gazebo

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

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

* Convert ignitionrobotics to gazebosim in sources and includes (#1758)

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

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

* Convert ignitionrobotics to gazebosim in tutorials (#1759)

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

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

* Final update of ignitionrobotics to gazebosim for citadel (#1760)

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

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

* remove PlotIcon (#1658)

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

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

* Fix UNIT_ign_TEST

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

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: youhy <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: methylDragon <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: AzulRadio <[email protected]>
* Fix Server_TEST and remove some ignition::
* Fix SystemLoader_TEST on Windows
  Use NormalizeDirectoryPath to fix path comparisons.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* Add more info to "bitrate limited" messages

Signed-off-by: Marko Krizmancic <[email protected]>

* Fix variance and stddev usage in RFComms

Input configuration for RFComms plugin takes sigma (standard deviation)
for parametrizing normal distribution. The structure for holding
distribution parameters (RFPower) is defined with mean and *variance*.
So, in initialization, sigma squared should be given to the RFPower
struct.

Signed-off-by: Marko Krizmancic <[email protected]>

* Fix the running window of sent bytes in RFComms

Because of the wrong comparison, the calculation of total bytes sent in
one epoch may include one message extra, resulting in larger number of
bytes sent than the actual.

Signed-off-by: Marko Krizmancic <[email protected]>

* Fix the running window of received bytes in RFComms

Signed-off-by: Marko Krizmancic <[email protected]>

* Fix message size calculation in RFComms

Signed-off-by: Marko Krizmancic <[email protected]>

* Fix max line length limitation

Signed-off-by: Marko Krizmancic <[email protected]>
This PR adjusts the hydrodynamics tests so they are abit less flaky. Currently, it seems like the test checks if one item falls faster than another.  However due to the inherent parrallelism, it seems like on different computers the balls start falling at different times. This means the 4 time steps we wait for may not be enough for a difference in velocity to appear. I suspect we no longer need to disable this test on windows.

Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Changelog.md Outdated Show resolved Hide resolved
src/systems/physics/Physics.cc Outdated Show resolved Hide resolved
src/systems/physics/Physics.cc Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Nov 14, 2022

Codecov Report

Merging #1794 (90eb788) into gz-sim7 (6a8594b) will increase coverage by 0.03%.
The diff coverage is 64.84%.

❗ Current head 90eb788 differs from pull request most recent head 6c45078. Consider uploading reports for the commit 6c45078 to get more accurate results

@@             Coverage Diff             @@
##           gz-sim7    #1794      +/-   ##
===========================================
+ Coverage    64.16%   64.19%   +0.03%     
===========================================
  Files          335      336       +1     
  Lines        26508    26916     +408     
===========================================
+ Hits         17008    17278     +270     
- Misses        9500     9638     +138     
Impacted Files Coverage Δ
include/gz/sim/SystemLoader.hh 100.00% <ø> (ø)
include/gz/sim/detail/EntityComponentManager.hh 93.86% <ø> (ø)
include/gz/sim/rendering/RenderUtil.hh 100.00% <ø> (ø)
src/gui/GuiFileHandler.cc 0.00% <0.00%> (ø)
.../plugins/component_inspector/ComponentInspector.hh 28.57% <ø> (ø)
src/gui/plugins/scene_manager/GzSceneManager.cc 17.58% <0.00%> (-0.60%) ⬇️
...rc/systems/ackermann_steering/AckermannSteering.hh 100.00% <ø> (ø)
src/systems/altimeter/Altimeter.cc 75.00% <ø> (-0.29%) ⬇️
src/systems/battery_plugin/LinearBatteryPlugin.cc 73.20% <ø> (ø)
src/systems/detachable_joint/DetachableJoint.cc 70.66% <ø> (ø)
... and 64 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@caguero caguero left a comment

Choose a reason for hiding this comment

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

I tested my code that uses thrusters and seems to work. I just noticed a warning that didn't see in the previous branch (6-to-7-20221021):

[ruby $(which gz) sim-1] [Err] [SDFFeatures.cc:320] Mesh construction from an SDF has not been implemented yet for dartsim.
[ruby $(which gz) sim-1] [Err] [SDFFeatures.cc:787] The geometry element of collision [collision] couldn't be created

@caguero
Copy link
Contributor

caguero commented Nov 14, 2022

I tested my code that uses thrusters and seems to work. I just noticed a warning that didn't see in the previous branch (6-to-7-20221021):

[ruby $(which gz) sim-1] [Err] [SDFFeatures.cc:320] Mesh construction from an SDF has not been implemented yet for dartsim.
[ruby $(which gz) sim-1] [Err] [SDFFeatures.cc:787] The geometry element of collision [collision] couldn't be created

This is coming from gz-physics, so probably unrelated due to a vcs pull.

@nkoenig nkoenig requested review from caguero and scpeters November 15, 2022 00:05
@scpeters
Copy link
Member

I just restarted the windows CI job after wiping the workspace

I think the commit history would be a little tidier if all the commits responding to PR feedback were squashed into 878625d

@mjcarroll
Copy link
Contributor

I think the commit history would be a little tidier if all the commits responding to PR feedback were squashed

Agree, otherwise looks good to me.

Signed-off-by: Nate Koenig <[email protected]>
@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 15, 2022

I squashed the commits down into 78b6699, but was unable to figure out how to squash them into 878625d. I was using the rebase command.

@azeey
Copy link
Contributor

azeey commented Nov 17, 2022

The physics system looks good. I only saw namespace changes.

To squash into 878625d, I think you can do

git reset --soft 878625d
git commit --amend

@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 22, 2022

The physics system looks good. I only saw namespace changes.

To squash into 878625d, I think you can do

git reset --soft 878625d
git commit --amend

Thanks.

Nate Koenig added 2 commits November 22, 2022 12:34
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
@mjcarroll mjcarroll changed the title 6 to 7 20221111 port: 6 to 7 20221111 Nov 28, 2022
@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 28, 2022

The failing tests are all related to fuelserver timeouts.

@nkoenig nkoenig merged commit 0e950b9 into gz-sim7 Nov 28, 2022
@nkoenig nkoenig deleted the 6-to-7-20221111 branch November 28, 2022 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.