Adjust to Gazebo 8 API and fix gazebo_ros_pkgs#612 #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note about the DisconnectWorldUpdateBegin: This function was deprecated
in favor of resetting the ConnectionPtr, see here:
https://bitbucket.org/osrf/gazebo/pull-requests/2329/deprecate-event-disconnect-connectionptr/diff
This issue also affects the mimic joint plugin:
ros-simulation/gazebo_ros_pkgs#612
The commit here fixes that issue for Gazebo 9. We should change the
GAZEBO_MAJOR_VERSION check to >= 7 if the following PR gets backported
to Gazebo 7 and 8:
https://bitbucket.org/osrf/gazebo/pull-requests/2814/fix-issue-2111-by-providing-options-to/diff
|
For a description, please see the extended individual commit messages. Tested on Gazebo 7 (the default in Kinetic) and Gazebo9. |
|
Also see ros-simulation/gazebo_ros_pkgs#688 . |
|
@mintar thanks for the PR. I will try to give it a look as soon as possible. Thanks for your patience. |
|
Sure, let me know if I can be of help. |
costashatz
reviewed
Mar 20, 2018
| @@ -22,21 +22,23 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISE | |||
|
|
|||
| #include <roboticsgroup_gazebo_plugins/mimic_joint_plugin.h> | |||
|
|
|||
| #if GAZEBO_MAJOR_VERSION >= 8 | |||
There was a problem hiding this comment.
I would prefer something like (there's no actual need to use the whole namespaces):
#if GAZEBO_MAJOR_VERSION >= 8
namespace math = ignition::math;
#else
namespace math = gazebo::math;
#endifThen, you can use math::clamp in the code..
There was a problem hiding this comment.
Great! Thanks! I will test it in my machine and then accept it! Thanks again!
|
@mintar thanks for the PR! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.