-
Notifications
You must be signed in to change notification settings - Fork 63
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
IGN -> GZ #27
IGN -> GZ #27
Conversation
@ahcorde this is specific to only garden, right ? forteress isn't impact ? |
@khancyr yes that's right - Garden only. @ahcorde I've been making similar changes for another Gazebo plugin (my marine ocean one), wondering if it is worth waiting until the Gazebo Garden interface is finalised before merging this change as I've been through a few iterations catching up as the namespace migration progresses; on the other hand the namespace changes may be breaking for Garden. |
we are still migrating I openned this PR just in case someone want to try this with Garden. I will try to keep it updated |
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde is the reset functionality required by the ign -> gz migration or is it optional? If it's optional we should split that into a separate PR. |
Signed-off-by: ahcorde <ahcorde@gmail.com>
@srmainwaring for now it's not optional, If I'm able to make it optional I will open another PR |
Signed-off-by: ahcorde <ahcorde@gmail.com>
this is ready for a review |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @ahcorde, thanks for the ign
-> gz
migration changes. I've made similar changes to my local branch and they seem to be in line.
The one feature I have not checked is the reset interface - so I'll need to run your branch to check that. Otherwise it's just a few minor changes here and there - mainly using the library short form in the plugins and switching the message ostream to the gz
version.
README.md
Outdated
It replaces the old Gazebo plugin to bring support of the next gen Gazebo simulator. | ||
It also brings support for more features : | ||
- more flexible data exchange between SITL and Ignition with JSON data sharing. | ||
- more sensors supported. | ||
- true Simulation lockstepping. It is now possible to use GDB to stop the Ignition time for debugging. | ||
- Better 3D rendering | ||
|
||
The project is composed of an Ignition plugin to connect to ArduPilot SITL (Software In The Loop) and some example models and worlds. | ||
The project is composed of an Gazebo plugin to connect to ArduPilot SITL (Software In The Loop) and some example models and worlds. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor gram. chg. an Gazebo to a Gazebo
README.md
Outdated
|
||
Follow the instructions for a [binary install of ignition fortress](https://ignitionrobotics.org/docs/fortress/install) and verify that ignition gazebo is running correctly. | ||
Follow the instructions for a [binary install of ignition fortress](https://ignitionrobotics.org/docs/garden/install) and verify that ignition gazebo is running correctly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Link is to garden, comment is for fortress. Suggest change comment to garden as well.
models/iris_with_standoffs/model.sdf
Outdated
@@ -538,11 +538,11 @@ | |||
<static>0</static> | |||
|
|||
<!-- plugins --> | |||
<plugin filename="libignition-gazebo-joint-state-publisher-system.so" | |||
name="ignition::gazebo::systems::JointStatePublisher"> | |||
<plugin filename="libgz-sim-joint-state-publisher-system.so" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can drop the lib
prefix and .so
suffix on the library names, so
libgz-sim-joint-state-publisher-system.so
to gz-sim-joint-state-publisher-system
, etc.
src/ArduPilotPlugin.cc
Outdated
@@ -1032,7 +1076,7 @@ void ignition::gazebo::systems::ArduPilotPlugin::ApplyMotorForces( | |||
else if (this->dataPtr->controls[i].type == "POSITION") | |||
{ | |||
//TODO: figure out whether position control matters, and if so, how to use it. | |||
ignwarn << "Failed to do position control on joint " << i << | |||
ignwarn << "Failed to do position control on joint " << i << |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change ignwarn
to gzwarn
and similarly for ignmsg
?
Signed-off-by: ahcorde <ahcorde@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ahcorde this LGTM, thanks!
Have tested iris_arducopter_runway.world
on latest pull of gz-sim (d90fab) against ArduPilot master on macOS Monterey Version 12.5, Xcode 13.2.1 and it's working well.
* ign -> gz: namespaces * IGN to GZ Signed-off-by: ahcorde <ahcorde@gmail.com> * update README.md Signed-off-by: ahcorde <ahcorde@gmail.com> * Added reset Signed-off-by: ahcorde <ahcorde@gmail.com> * Update Signed-off-by: ahcorde <ahcorde@gmail.com> * more updates Signed-off-by: ahcorde <ahcorde@gmail.com> * clean worlds Signed-off-by: ahcorde <ahcorde@gmail.com> * more ign to gz Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: ahcorde <ahcorde@gmail.com> Co-authored-by: Gustavo <g.rezendesilva@tudelft.nl>
* Forward port to support ignition garden: ignition-gazebo5 to ignition-gazebo7 - Use new interface on EntityComponentManager::CreateComponent - Remove unused package dependencies from CMakeLists.txt - Update dependency to ignition-gazebo7 * Remove unused includes * Update comment for Ignition Gazebo * Fix: use copied imuMsg * Readme: re init readme * IrlockPluging: fix port as per khancyr/ardupilot_gazebo#48 * Add COMMAND control type (#18) * Add RELAY control type * Rename new control type from RELAY to COMMAND - Minor updates to parameter documentation - Rename new control type to COMMAND - Add dependency on World utility and use it to fully scope command topic names - Remove work-around for ArduSub as the initialisation issue should be fixed upstream Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> Co-authored-by: Clyde McQueen <clyde@mcqueen.net> * IGN -> GZ (#27) * ign -> gz: namespaces * IGN to GZ Signed-off-by: ahcorde <ahcorde@gmail.com> * update README.md Signed-off-by: ahcorde <ahcorde@gmail.com> * Added reset Signed-off-by: ahcorde <ahcorde@gmail.com> * Update Signed-off-by: ahcorde <ahcorde@gmail.com> * more updates Signed-off-by: ahcorde <ahcorde@gmail.com> * clean worlds Signed-off-by: ahcorde <ahcorde@gmail.com> * more ign to gz Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: ahcorde <ahcorde@gmail.com> Co-authored-by: Gustavo <g.rezendesilva@tudelft.nl> * Merge Garden -> Main - Update installation notes for running with Gazebo Garden and add links to previous version. - Minor formatting and style changes to README. - Update Github CI build script for Ubuntu Focal / Garden. - Add build status badge to README. Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> Co-authored-by: Clyde McQueen <clyde@mcqueen.net> Co-authored-by: Pierre Kancir <pierre.kancir@manna.aero> Co-authored-by: Pierre Kancir <pierre.kancir.emn@gmail.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Co-authored-by: Gustavo <g.rezendesilva@tudelft.nl>
Build on top of this other PR #26