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.

Sign up for GitHub

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

Jump to bottom

A complete overhaul of vehicle and world generation through jinja as well as json. #651

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

A complete overhaul of vehicle and world generation through jinja as well as json. #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6003f
A complete overhaul of vehicle and world generation through jinja as …
bperseghetti Oct 26, 2020
c0d926f
Merge branch 'master' into pr-hitl-capable-jinja
bperseghetti Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -25,3 +25,5 @@ models/rover/rover.sdf
models/tiltrotor/tiltrotor.sdf
bperseghetti marked this conversation as resolved.
Show resolved Hide resolved
models/boat/boat.sdf
models/typhoon_h480/typhoon_h480.sdf
models/temp*
worlds/temp*
Copy link
Member

Choose a reason for hiding this comment

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

I can't find my previous review anymore, what is stopping us from moving this to /tmp?

11 changes: 7 additions & 4 deletions models/iris/iris.sdf.jinja
View file
Open in desktop
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!-- DO NOT EDIT: Generated from iris.sdf.jinja -->
<sdf version='1.6'>
<model name='iris'>
{% set model_name = 'iris' if model_name == 'NotSet' else model_name %}
{% set sdf_version = '1.6' if sdf_version == 'NotSet' else sdf_version %}
<sdf version='{{ sdf_version }}'>
<model name='{{ model_name }}'>
<link name='base_link'>
<pose>0 0 0 0 0 0</pose>
<inertial>
Expand Down Expand Up @@ -489,8 +492,8 @@
<magSubTopic>/mag</magSubTopic>
<baroSubTopic>/baro</baroSubTopic>
<mavlink_addr>INADDR_ANY</mavlink_addr>
<mavlink_tcp_port>{{ mavlink_tcp_port }}</mavlink_tcp_port>
<mavlink_udp_port>{{ mavlink_udp_port }}</mavlink_udp_port>
<mavlink_tcp_port>{{ mavlink_tcp_port }}</mavlink_tcp_port>
<serialEnabled>{{ serial_enabled }}</serialEnabled>
<serialDevice>{{ serial_device }}</serialDevice>
<baudRate>{{ serial_baudrate }}</baudRate>
Expand All @@ -502,7 +505,7 @@
<hil_state_level>0</hil_state_level>
<send_vision_estimation>0</send_vision_estimation>
<send_odometry>1</send_odometry>
<enable_lockstep>1</enable_lockstep>
<enable_lockstep>{{ enable_lockstep }}</enable_lockstep>
<use_tcp>1</use_tcp>
<motorSpeedCommandPubTopic>/gazebo/command/motor_speed</motorSpeedCommandPubTopic>
<control_channels>
Expand Down