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 ign-gazebo6 ➡️ gz-sim7 #2098

Merged
merged 24 commits into from
Aug 29, 2023
Merged

Merge ign-gazebo6 ➡️ gz-sim7 #2098

merged 24 commits into from
Aug 29, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Aug 26, 2023

➡️ Forward port

Port ign-gazebo6 ➡️ gz-sim7

Branch comparison: gz-sim7...ign-gazebo6

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

azeey and others added 23 commits May 2, 2023 23:14
…usly (gazebosim#1962)

The main reason that the Resource Spawner took a long time to load is that it tried to fetch the list of all available models on Fuel instead of just the selected owner. And it did that while blocking the Qt thread, so the user was unable to interact with the GUI while the model list was being fetched. The approach I've taken is to only fetch the list of models for the default owner ("openrobotics") and allow users to add/remove any owner they want. The fetching is also done in a separate thread so as to not block the GUI.
---------

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Include gz/msgs.hh instead of ignition
* Install components.hh to gz/sim

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
…ts on a topic (gazebosim#1994)

* Working on marker topic

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fixed build

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fixed test

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Cleanup

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* codecheck

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

---------

Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Extending the feature for detachable_joint plugin to support re-attaching the joint again. By publishing to a topic, the child link can be easily reattached with a fixed joint to its parent link. 

Signed-off-by: Liam Han <liam@openrobotics.org>
Signed-off-by: Liam Han <liamhan0905@gmail.com>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
…in a `<world>` (gazebosim#1998)

Signed-off-by: Henrique-BO <henrique.barrosoliveira@usp.br>
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
…azebosim#2006)

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>

* TriggeredPublisher: don't catch FatalException
  It has been removed from recent versions of protobuf.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-gazebo3 ➡️  ign-gazebo6
…azebosim#2006)

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>

* TriggeredPublisher: don't catch FatalException
  It has been removed from recent versions of protobuf.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
…fore `Finalize` (gazebosim#2047)

* Adds a warning if the `Server` method of a `TestFixture` is called
before `Finalize

This commit adds a warning if someone were to call `Server()` before
`Finalize`. The rationale for this is because I made the mistake of not
calling `Finalize` ina program I was writing. It took me some time to
track down the root cause of the problem. I figure if we warn users it
should be immediately obvious.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* switch to gzwarn over ignwarn

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* ignwarn cause citadel :(

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

---------

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
gazebosim#2052)

This fixes errors such as
```
Error [Utils.cc:174] Missing element description for [persistent]
```

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

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
…azebosim#2001)

* Fix Joint Position Controller Behaviour Described in gazebosim#1997 

There are several issues at play. First the target velcity calculation
was wrong as described in gazebosim#1997. Secondly, even if we corrected that
there was still incorrect behaviour. This is due to the fact that we use
the PID's CmdMax to determine what the maximum velocity for the joint
is. However, in the event a user does not set a `<cmd_max>` this
defaults to zero and the joint does not move. Finally this PR updates
the tests. Previously our tests were only testing the case where the
position command was well above the position's maximum velocity, hence
it would slide into position. This PR introduces a test where we snap
the position of the joint into place instead.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Address PR feedback with regards to style.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Just one more thing

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* style

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* More minor style fixes

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* More minor style fixes

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Tracks periodic changes in scene broadcaster (gazebosim#2010)

* Tracks periodic changes in scene broadcaster

This commit proposes a change to the scene broadcaster which enables
tracking of all components with periodic changes. This way if a
component has a periodic change the scene broadcaster does not miss it.

For more info see this discussion gazebosim#2001 (comment) where @azeey proposes this solution.

This commit is WIP and I still need to handle entity/component removal
and add tests.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Rework changes

* Removes clone made of BaseComponent.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* More reworks of added APIs to ECM.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Fix tests

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Add ECM related tests.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Address spelling issue

Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Arjo Chakravarty <arjo129@gmail.com>

* Get rid of TODO

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

---------

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Arjo Chakravarty <arjo129@gmail.com>
Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Migrate to new header.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Update test paths

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Update include/gz/sim/EntityComponentManager.hh

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo129@gmail.com>

* Rename methods

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* style

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Flipped data structure around

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Fix GCC warning

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

---------

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Arjo Chakravarty <arjo129@gmail.com>
Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-gazebo3 ➡️  ign-gazebo6
Merge ign-gazebo3 ➡️  ign-gazebo6
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey self-assigned this Aug 26, 2023
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Aug 26, 2023
@azeey azeey added the beta Targeting beta release of upcoming collection label Aug 26, 2023
@iche033
Copy link
Contributor

iche033 commented Aug 26, 2023

looks like the fuel-tools8 debbuilds failed so the new API needed by resource spawner is not available.

@iche033
Copy link
Contributor

iche033 commented Aug 26, 2023

looks like the fuel-tools8 debbuilds failed so the new API needed by resource spawner is not available.

gazebo-release/gz-fuel-tools8-release#14

@azeey
Copy link
Contributor Author

azeey commented Aug 28, 2023

@osrf-jenkins run tests please

@@ -111,6 +112,7 @@ set(tests_needing_display
shader_param_system.cc
thermal_sensor_system.cc
thermal_system.cc
triggered_camera.cc
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@iche033 This was removed from gz-sim7 for some reason. I added it back here, but if you know it should be removed, let me know.

Copy link
Contributor

@iche033 iche033 Aug 28, 2023

Choose a reason for hiding this comment

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

probably got lost in the forward ports. The test was forward ported here but not the CMakeList.txt changes

@azeey
Copy link
Contributor Author

azeey commented Aug 28, 2023

ServerRepeat/ServerFixture.SdfWithoutWorld/0 is failing. Looking into it.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Copy link
Contributor Author

azeey commented Aug 29, 2023

ServerRepeat/ServerFixture.SdfWithoutWorld/0 is failing. Looking into it.

It turns out the test is not relevant in gz-sim7 because SDF files without <world> are supported in gz-sim7, so I've removed the test.

@azeey azeey merged commit bfe5836 into gazebosim:gz-sim7 Aug 29, 2023
4 checks passed
@azeey azeey deleted the 6_to_7 branch August 29, 2023 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

10 participants