[conf] merge bartremes/master, Closes #1431

This commit is contained in:
Christophe De Wagter
2015-11-23 11:41:26 +01:00
parent 942eefa808
commit db1e688fee
2 changed files with 40 additions and 0 deletions
@@ -34,6 +34,13 @@
<load name="logger_file.xml">
<define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
</load>
<load name="mavlink.xml">
<define name="UDP1_PORT_OUT" value="5000"/>
<define name="UDP1_PORT_IN" value="5000"/>
<define name="UDP1_HOST" value="192.168.42.2"/>
<configure name="MAVLINK_PORT" value="UDP1"/>
<define name="MAVLINK_SYSID" value="1"/>
</load>
</modules>
<commands>
+33
View File
@@ -175,6 +175,28 @@
settings_modules="modules/light.xml modules/digital_cam.xml"
gui_color="blue"
/>
<aircraft
name="bebop2_22"
ac_id="22"
airframe="airframes/TUDelft/airframes/bebop2_indi.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_secondary.xml settings/control/stabilization_att_indi.xml [settings/control/stabilization_att_int_quat.xml]"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/gps_ubx_ucenter.xml"
gui_color="#ffff0689b7a1"
/>
<aircraft
name="bebop2_23"
ac_id="23"
airframe="airframes/TUDelft/airframes/bebop2_indi.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_secondary.xml settings/control/stabilization_att_indi.xml [settings/control/stabilization_att_int_quat.xml]"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/gps_ubx_ucenter.xml"
gui_color="#ffff0689b7a1"
/>
<aircraft
name="bebop_flip"
ac_id="3"
@@ -219,6 +241,17 @@
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml"
gui_color="blue"
/>
<aircraft
name="mavshot"
ac_id="5"
airframe="airframes/TUDelft/airframes/mavshot.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_indi.xml settings/modules/config_asctec_v2_new.xml"
settings_modules="modules/gps_ubx_ucenter.xml"
gui_color="blue"
/>
<aircraft
name="quadshot_pylons"
ac_id="178"