13 ➡️ main #1179
Merged
13 ➡️ main #1179
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
* fix: Use PACKAGE_PREFIX_DIR to ensure relocatable CMake install for conan Signed-off-by: Stefan Profanter <stefan.profanter@agile-robots.com> * Compute relative path for pkgconfig folder. This accounts for arch-dependent lib folders. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Merge sdf9 ➡️ sdf12
HAVE_URDFDOM and USE_INTERNAL_URDF aren't used in C++ code and should be removed. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* Use `±inf` instead of `±1e16` for position limits * Use `inf` instead of `-1` for effort, velocity limits Signed-off-by: Steve Peters <scpeters@openrobotics.org>
The urdf.sdf and collision_engine.sdf files are not included by any other spec file, so they can be removed. Fixes #635. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
When converting a fixed joint in a URDF file to SDFormat, by default the contents of the child link are merged into the parent link, but poses in gazebo extensions such as //gazebo/sensor/pose are not properly transformed (#378). This issue has already been fixed in newer branches by #525, so the test and that fix have been backported and refactored to reduce code duplication (about 30 lines removed from parser_urdf.cc) and also fix the treatment of //gazebo/light/pose. Fixes #378. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge sdf9 ➡️ sdf12
Merge sdf12 ➡️ sdf13
Signed-off-by: marqrazz <marq.razz@gmail.com>
Signed-off-by: Brian Chen <brian.chen@openrobotics.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
This fixes an issue with linking to python libraries on macOS. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* camera.sdf: fields for projection matrix Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Update Changelog and Migration guide. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge sdf9 ➡️ sdf12
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Adapting the code to the change in gazebosim/gz-math#503 Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
* Change to sdformat13 module name for python Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
* Update to 13.0.0~pre2 Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> * Update Changelog Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
The urdf_gazebo_extensions.urdf file had incorrect kinematics with link3 being the child of two different joints. This adds a link4 and replaces joint13 with joint14 connecting link1 and link4. This also fixes some expectations about the implicit_spring_damper tags. * parser_urdf: clean up internal functions by removing unused parameters and making other parameters const. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge sdf9 ➡️ sdf12
Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org>
These directories are added via our cmake macros and don't need to be here. Additionally, one of the patterns was incorrect and adding a relative path to the include dirs. Signed-off-by: Michael Carroll <michael@openrobotics.org>
* Just disable the tests Signed-off-by: Nate Koenig <nate@openrobotics.org>
Currently the location of some links and joints is lost when fixed joints are reduced and links lumped together. This adds //model/frame tags with the same name and pose of the reduced links and joints. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge sdf12 ➡️ sdf13
Merge sdf9 ➡️ sdf12
|
lots of python test failures |
* python: Don't import more than is used in the tests - should cause a failure due to gz.math not always being imported. * python: Import gz.math at startup to fix #1129 Signed-off-by: Will Stott <willstott101@gmail.com> Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org> Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Follow-up for #1148 with a cleaner implementation for the sdf13 branch that constructs sdf::Frame objects and serializes them to a string rather than using a stringstream to construct XML. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
…cementPolicy::ERR (#1131) Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>
Merge sdf12 ➡️ sdf13
This adds an option for the SDF parser to attempt to resolve any URIs in the document via a user-provided callback. This works similarly to how include/uri is resolved, but works for all uri elements. A ParserConfig parameter is added to opt in to this behavior. In the case that the user-provided callback cannot resolve the URI (returns an empty string), the original contents of the uri tag will be preserved. Signed-off-by: Michael Carroll <michael@openrobotics.org>
…kages (#1180) Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
28dcb8c to
786b93a
Compare
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
786b93a to
d361170
Compare
Codecov Report
@@ Coverage Diff @@
## main #1179 +/- ##
==========================================
+ Coverage 86.71% 87.10% +0.38%
==========================================
Files 125 125
Lines 15964 16027 +63
==========================================
+ Hits 13843 13960 +117
+ Misses 2121 2067 -54
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
scpeters
approved these changes
Oct 12, 2022
Prepare for sdfromat13 13.1.0 release. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
|
May be worth doing one more pull now that 13 has a 13.1.0 release. |
Signed-off-by: Michael Carroll <michael@openrobotics.org>
cbccbbb to
5ada88a
Compare
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.
➡️ Forward port
Port
sdf13tomainBranch comparison: main...sdf13
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)