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

6 ➡️ 7 #1367

Merged
merged 57 commits into from
Mar 10, 2022
Merged

6 ➡️ 7 #1367

merged 57 commits into from
Mar 10, 2022

Conversation

mjcarroll
Copy link
Contributor

6 ➡️ 7

Port ign-gazebo6 to main

Branch comparison: main...ign-gazebo6

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

chapulina and others added 30 commits December 22, 2021 10:46
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
…el retarget) (#1314)

In the event a user enters the wrong name for a certain joint, the JointPositionController system will silently fail. This PR adds a simple error message that tells the user that the joint was not found.

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* load and run visual plugins on gui end

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* scene update event emitted on both server and gui side

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* shader param update working

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* sim time, constants, full example working

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add integration test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* code cleanup

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* more code cleanup

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* style fixes and add some comments

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* review changes

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* require display for shader param test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* style and comment

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* limit thrust cmd

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* check and error when max < min

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Add elevator system

Closes #420

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Limit line length for transition table

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add PRIVATE_INCLUDE_DIRS argument to gz_add_system

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add afsm and metapushkin libraries

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add namespace to events, actions and guards

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Migrate to afsm

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Fixes

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>
There was some weird indentation going on in the `Link.hh` header file. This PR fixes it.

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
This PR adds a Link::SetLinearVelocity() method. I foresee this method being useful for testing behaviour of systems like the hydrodynamics or liftDrag plugin which are dependent on velocity for their output forces.

Signed-off-by: Arjo Chakravarty arjo@openrobotics.org
updates the ShaderParam system with the ability to parse texture params and pass them to custom shaders

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* New trajectory follower system

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Update changelog
* Bump to 6.5.0

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
The ign-math Pose addition operator is going to be
deprecated, so use the multiplication operator instead.
It works in the opposite order, matching the behavior
of coordinate transform multiplication.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
iche033 and others added 4 commits March 3, 2022 12:09
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
This 1 character PR fixes a typo in the python tutorial.

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
@chapulina chapulina added 🌱 garden Ignition Garden and removed 🏯 fortress Ignition Fortress labels Mar 4, 2022
@chapulina
Copy link
Contributor

The only new test failure seems to be INTEGRATION_shader_param_system. Any suggestions on forward-porting this, @iche033 ?

@mjcarroll
Copy link
Contributor Author

For more context, it looks like the SceneUpdate Event is still firing even after the server has run all of it's iterations?

(gdb) bt
#0  [33mignition::rendering::v7::ShaderParams::operator[][m ([36mthis=this@entry[m=0x0, [36m_name[m="color") at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-rendering/src/ShaderParams.cc[m:130
#1  [34m0x00007fffcbe53393[m in [33mignition::gazebo::v7::systems::ShaderParamPrivate::OnUpdate[m ([36mthis[m=0x5555574e1260) at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-gazebo/src/systems/shader_param/ShaderParam.cc[m:468
#2  [34m0x00007fffd0b19c51[m in [33mstd::function<void ()>::operator()() const[m ([36mthis[m=<optimized out>) at [32m/usr/include/c++/9/bits/std_function.h[m:683
#3  [33mignition::common::EventT<void (), ignition::gazebo::v7::events::SceneUpdateTag>::Signal<>()[m ([36mthis[m=0x555557128d10) at [32m/home/mjcarroll/workspaces/ign_garden/install/include/ignition/common5/ignition/common/Event.hh[m:146
#4  [33mignition::gazebo::v7::EventManager::Emit<ignition::common::EventT<void (), ignition::gazebo::v7::events::SceneUpdateTag>>()[m ([36mthis[m=<optimized out>) at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-gazebo/include/ignition/gazebo/EventManager.hh[m:112
#5  [34m0x00007fffd0a8c061[m in [33mignition::gazebo::v7::RenderUtil::Update[m ([36mthis=this@entry[m=0x5555574d9d88) at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-gazebo/src/rendering/RenderUtil.cc[m:1592
#6  [34m0x00007fffec224774[m in [33mignition::gazebo::v7::systems::SensorsPrivate::RunOnce[m ([36mthis[m=0x5555574d9d70) at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-gazebo/src/systems/sensors/Sensors.cc[m:242
#7  [34m0x00007fffec225158[m in [33mignition::gazebo::v7::systems::SensorsPrivate::RenderThread[m ([36mthis[m=0x5555574d9d70) at [32m/home/mjcarroll/workspaces/ign_garden/src/ign-gazebo/src/systems/sensors/Sensors.cc[m:312
#8  [34m0x00007ffff7294de4[m in [33m??[m () from [32m/lib/x86_64-linux-gnu/libstdc++.so.6[m
#9  [34m0x00007ffff7c16609[m in [33mstart_thread[m ([36marg[m=<optimized out>) at [32mpthread_create.c[m:477
#10 [34m0x00007ffff70d0163[m in [33mclone[m () at [32m../sysdeps/unix/sysv/linux/x86_64/clone.S[m:95

@iche033
Copy link
Contributor

iche033 commented Mar 8, 2022

The only new test failure seems to be INTEGRATION_shader_param_system. Any suggestions on forward-porting this, @iche033 ?

looks like ign-fuel_tools8 have issue downloading these models. I tried downloading the models using the command line in Fortress and Garden:

ign fuel download -v 4 --url "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/waves"

With Garden, I see that the meshes and materials directories do not exist after unzipping. It could be something to do with recent changes in ign-common filesystem but not sure yet.

@iche033
Copy link
Contributor

iche033 commented Mar 8, 2022

For more context, it looks like the SceneUpdate Event is still firing even after the server has run all of it's iterations?

I think the segfault is due to missing model files. If I copy the correctly downloaded / unzipped models to the test directory's fuel cache, the test passes.

@chapulina
Copy link
Contributor

With Garden, I see that the meshes and materials directories do not exist after unzipping. It could be something to do with recent changes in ign-common filesystem but not sure yet.

Oh I believe that was fixed by gazebosim/gz-common#308, maybe we just need to retrigger CI then

Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

I retriggered just the build where the shader test was failing. I think this is good to go if that passes.

@iche033
Copy link
Contributor

iche033 commented Mar 8, 2022

Oh I believe that was fixed by ignitionrobotics/ign-common#308, maybe we just need to retrigger CI then

nice I just updated ign-common5 in my workspace and that fixed the test.

@mjcarroll
Copy link
Contributor Author

mjcarroll commented Mar 8, 2022

Now getting new failures:

INTEGRATION_recreate_entities

[ RUN      ] RecreateEntitiesFixture.RecreateEntities_WorldJoint
  [Msg] Loading SDF world file[/github/workspace/test/worlds/fixed_world_joint.sdf].
  [Msg] Loaded level [3]
  [Msg] No systems loaded from SDF, loading defaults
  [Dbg] [ServerConfig.cc:931] Loaded (3) plugins from file [/github/workspace/build/test/fake_home/.ignition/gazebo/7/server.config]
  [Dbg] [Physics.cc:801] Loaded [ignition::physics::dartsim::Plugin] from library [/usr/lib/x86_64-linux-gnu/ign-physics-6/engine-plugins/libignition-physics-dartsim-plugin.so]
  [Dbg] [SystemManager.cc:49] Loaded system [ignition::gazebo::systems::Physics] for entity [1]
  [Msg] Create service on [/world/default/create]
  [Msg] Remove service on [/world/default/remove]
  [Msg] Pose service on [/world/default/set_pose]
  [Msg] Light configuration service on [/world/default/light_config]
  [Msg] Physics service on [/world/default/set_physics]
  [Msg] SphericalCoordinates service on [/world/default/set_spherical_coordinates]
  [Msg] Enable collision service on [/world/default/enable_collision]
  [Msg] Disable collision service on [/world/default/disable_collision]
  [Msg] Material service on [/world/default/visual_config]
  [Dbg] [SystemManager.cc:49] Loaded system [ignition::gazebo::systems::UserCommands] for entity [1]
  [Dbg] [SystemManager.cc:49] Loaded system [ignition::gazebo::systems::SceneBroadcaster] for entity [1]
  [Msg] Serving world controls on [/world/default/control], [/world/default/control/state] and [/world/default/playback/control]
  [Msg] Serving GUI information on [/world/default/gui/info]
  [Msg] World [default] initialized with [1ms] physics profile.
  [Msg] Serving world SDF generation service on [/world/default/generate_world_sdf]
  [Msg] Serving world names on [/gazebo/worlds]
  [Msg] Resource path add service on [/gazebo/resource_paths/add].
  [Msg] Resource path get service on [/gazebo/resource_paths/get].
  [Msg] Resource paths published on [/gazebo/resource_paths].
  [Msg] Server control service on [/server_control].
  [Msg] Found no publishers on /stats, adding root stats topic
  [Msg] Found no publishers on /clock, adding root clock topic
  [Dbg] [SimulationRunner.cc:490] Creating PostUpdate worker threads: 3
  [Dbg] [SimulationRunner.cc:501] Creating postupdate worker thread (0)
  [Dbg] [SimulationRunner.cc:501] Creating postupdate worker thread (1)
  [Msmalloc(): invalid next->prev_inuse (unsorted)
195/195 Test #195: testFixture_TEST.py ....................................Child aborted***Exception:   3.31 sec
  terminate called after throwing an instance of 'pybind11::error_already_set'
    what():  TypeError: Unable to convert function return value to a Python type! The signature was
  	(self: ignition.gazebo.World, arg0: ignition.gazebo.EntityComponentManager) -> Optional[ignition::math::v7::Vector3<double>]
  
  At:
    /github/workspace/python/test/testFixture_TEST.py(46): on_pre_udpate_cb
  

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor

The testFixture.py failure should be fixed by ce0a85f, but we need to release python3-ignition-math7. I'm on it.

I can't reproduce the INTEGRATION_recreate_entities failure either.

@mjcarroll
Copy link
Contributor Author

I can't reproduce the INTEGRATION_recreate_entities failure either.

The final error message would make me think it's probably some sort of heap corruption, but I don't know how to even begin to unwind that without more context.

@chapulina
Copy link
Contributor

I opened #1380 with a subset of commits from this PR while we sort out the python3-ignition-math7 release.

@chapulina
Copy link
Contributor

CI is happy!

@chapulina chapulina merged commit 3969f5b into main Mar 10, 2022
@chapulina chapulina deleted the ports/6_to_main branch March 10, 2022 19:03
@j-rivero j-rivero mentioned this pull request Sep 16, 2022
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.