Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

[conf] commit reordering done by pprz center

Browse Source
This commit is contained in:
Felix Ruess
2016-06-16 19:42:45 +02:00
parent d6520daa19
commit dfa6678b6c
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/conf_example.xml
+23 -23
View File
@@ -1,4 +1,15 @@
<conf> <conf>
<aircraft
name="Ark_Quad"
ac_id="41"
airframe="airframes/AGGIEAIR/aggieair_ark_quad_lisa_mx.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/nps.xml settings/control/stabilization_att_float_euler.xml"
settings_modules=""
gui_color="#ffff954c0000"
/>
<aircraft <aircraft
name="BOOZ2" name="BOOZ2"
ac_id="1" ac_id="1"
@@ -98,6 +109,17 @@
settings_modules="modules/air_data.xml modules/nav_smooth.xml modules/nav_survey_poly_osam.xml" settings_modules="modules/air_data.xml modules/nav_smooth.xml modules/nav_survey_poly_osam.xml"
gui_color="blue" gui_color="blue"
/> />
<aircraft
name="Minion_Lia"
ac_id="42"
airframe="airframes/AGGIEAIR/aggieair_rp3_lia.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/AGGIEAIR/BasicTuning_Launcher.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml settings/control/ctl_basic.xml"
settings_modules="modules/nav_survey_poly_osam.xml modules/nav_skid_landing.xml"
gui_color="#00009e93ffff"
/>
<aircraft <aircraft
name="Quad_Elle0" name="Quad_Elle0"
ac_id="19" ac_id="19"
@@ -216,8 +238,8 @@
telemetry="telemetry/default_rotorcraft.xml" telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml" flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int_quat.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml settings/nps.xml" settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int_quat.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml settings/nps.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml"
gui_color="red" gui_color="red"
settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml"
/> />
<aircraft <aircraft
name="bebop" name="bebop"
@@ -285,26 +307,4 @@
settings_modules="" settings_modules=""
gui_color="blue" gui_color="blue"
/> />
<aircraft
name="Ark_Quad"
ac_id="41"
airframe="airframes/AGGIEAIR/aggieair_ark_quad_lisa_mx.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/nps.xml settings/control/stabilization_att_float_euler.xml"
settings_modules=""
gui_color="#ffff954c0000"
/>
<aircraft
name="Minion_Lia"
ac_id="42"
airframe="airframes/AGGIEAIR/aggieair_rp3_lia.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/AGGIEAIR/BasicTuning_Launcher.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml settings/control/ctl_basic.xml"
settings_modules="modules/nav_survey_poly_osam.xml"
gui_color="#00009e93ffff"
/>
</conf> </conf>
conf/conf_tests.xml
+1 -1
View File
@@ -392,7 +392,7 @@
telemetry="telemetry/default_rotorcraft.xml" telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml" flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_float_mlkf.xml settings/control/stabilization_att_int_quat.xml settings/nps.xml" settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_float_mlkf.xml settings/control/stabilization_att_int_quat.xml settings/nps.xml"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml" settings_modules="modules/geo_mag.xml modules/air_data.xml"
gui_color="red" gui_color="red"
/> />
<aircraft <aircraft