Move iris to use jinja templates #609
Merged
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
Since generated sdf files are now marked as <model>-gen.sdf, `iris.sdf` should be also marked as `iris-gen.sdf` Move iris to jinja templates This commit deprecates the xacro based sdf generation for the iris model
This commit moves the meshfiles out of rotors_description so that we can deprecate rotors_description once the mutlivehicle scripts are based on jinja templates
Jaeyoung-Lim
force-pushed
the
pr-gen-suffix
branch
from
e6d3162
to
40f495e
Compare
|
SITL test failures seem quite intermittent |
Wasn't able to build mavsdk tests due to the incorrect mavsdk version
Jaeyoung-Lim
force-pushed
the
pr-gen-suffix
branch
from
40f495e
to
107565e
Compare
This was referenced Sep 27, 2020
TSC21
reviewed
Sep 28, 2020
TSC21
reviewed
Sep 28, 2020
TSC21
reviewed
Sep 28, 2020
TSC21
reviewed
Sep 28, 2020
| </joint_control_pid> | ||
| <joint_name>zephyr_delta_wing::propeller_joint</joint_name> | ||
| </channel> | ||
| <channel name='rotor6'> |
There was a problem hiding this comment.
Since this is not related to this PR, and is causing SITL failures can we address it in a separate PR? This is blocking multivehicle scripting and mavsdk testing for jinja based models
There was a problem hiding this comment.
But it's not making much sense why this would cause failures. This isn't supposed to exist for this model.
Jaeyoung-Lim
force-pushed
the
pr-gen-suffix
branch
2 times, most recently
from
c454311
to
e45e102
Compare
- Explicitly state that the sdf file is genretaed - Remove -0 - Remove redundant channels - Fix model configs
Jaeyoung-Lim
force-pushed
the
pr-gen-suffix
branch
from
e45e102
to
8aa5294
Compare
TSC21
approved these changes
Sep 29, 2020
|
@TSC21 Thanks! |
RyosukeMatsushima
pushed a commit
to RyosukeMatsushima/PX4-SITL_gazebo
that referenced
this pull request
Jun 21, 2022
* mark iris.sdf as iris-gen.sdf Since generated sdf files are now marked as <model>-gen.sdf, `iris.sdf` should be also marked as `iris-gen.sdf` Move iris to jinja templates This commit deprecates the xacro based sdf generation for the iris model * Move meshfiles out of rotors_description This commit moves the meshfiles out of rotors_description so that we can deprecate rotors_description once the mutlivehicle scripts are based on jinja templates * Update mavsdk version Wasn't able to build mavsdk tests due to the incorrect mavsdk version * Address review comments - Explicitly state that the sdf file is genretaed - Remove -0 - Remove redundant channels - Fix model configs
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.
Problem Description
iriswas the only model being generated with xacro macros, and xacro macros are slowly becoming out of date by not supporting more recent sdf syntaxes.Solution
This PR moves the
irismodel generation from xacro macros to jinja templates by doing the following.rotors_descriptiontoirisWe keep the xacro macros for now, since the multivehicle scripts still rely on them.
rotors_descriptionwill be deprecated once the multivehicle scripts are based on jinja templating.