[conf] sort conf example and test

paparazzi · May 13, 2014 · 70a3987 · 70a3987
1 parent 754a8c8
commit 70a3987
Show file tree

Hide file tree

Showing 2 changed files with 303 additions and 317 deletions.
diff --git a/conf/conf_example.xml b/conf/conf_example.xml
@@ -1,59 +1,14 @@
-<?xml version="1.0"?>
 <conf>
-
-  <!-- booz2 / navgo -->
-  <aircraft
-    name="BOOZ2"
-    ac_id="150"
-    airframe="airframes/examples/booz2.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_rotorcraft.xml"
-    flight_plan="flight_plans/dummy.xml"
-    settings="settings/rotorcraft_basic.xml"
-    gui_color="white"
-    />
-  <aircraft
-    name="Quad_NavGo"
-    ac_id="151"
-    airframe="airframes/examples/quadrotor_navgo.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_rotorcraft.xml"
-    flight_plan="flight_plans/rotorcraft_basic.xml"
-    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml settings/modules/servo_switch.xml"
-    gui_color="white"
-    />
-
-  <!-- LISA -->
-  <aircraft
-    name="Hexa_LisaL"
-    ac_id="153"
-    airframe="airframes/examples/h_hex.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_rotorcraft.xml"
-    flight_plan="flight_plans/dummy.xml"
-    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
-    gui_color="white"
-    />
-  <aircraft
-    name="Quad_LisaM_2"
-    ac_id="162"
-    airframe="airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_rotorcraft.xml"
-    flight_plan="flight_plans/rotorcraft_basic.xml"
-    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-    gui_color="white"
-    />
-  <aircraft
-    name="Quad_LisaS"
-    ac_id="163"
-    airframe="airframes/examples/quadrotor_lisa_s.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_rotorcraft.xml"
-    flight_plan="flight_plans/rotorcraft_basic.xml"
-    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
-    gui_color="white"
-    />
+  <aircraft
+   name="BOOZ2"
+   ac_id="150"
+   airframe="airframes/examples/booz2.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/dummy.xml"
+   settings="settings/rotorcraft_basic.xml"
+   gui_color="white"
+  />
   <aircraft
    name="Bixler"
    ac_id="24"
@@ -64,6 +19,26 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="EasyStar_ETS"
+   ac_id="8"
+   airframe="airframes/examples/easystar_ets.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_fixedwing.xml"
+   flight_plan="flight_plans/basic.xml"
+   settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
+   gui_color="red"
+  />
+  <aircraft
+   name="Hexa_LisaL"
+   ac_id="153"
+   airframe="airframes/examples/h_hex.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/dummy.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
+   gui_color="white"
+  />
   <aircraft
    name="MentorEnergy"
    ac_id="77"
@@ -74,6 +49,16 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml"
    gui_color="#ffffffffffff"
   />
+  <aircraft
+   name="Microjet"
+   ac_id="5"
+   airframe="airframes/examples/microjet.xml"
+   radio="radios/cockpitMM.xml"
+   telemetry="telemetry/default_fixedwing.xml"
+   flight_plan="flight_plans/basic.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   gui_color="#6293ba"
+  />
   <aircraft
    name="Microjet_LisaM"
    ac_id="4"
@@ -84,88 +69,47 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/control/ctl_dash_loiter_trim.xml settings/estimation/ins_neutrals.xml"
    gui_color="blue"
   />
-  <!-- tiny/umarim -->
-  <aircraft
-    name="Microjet"
-    ac_id="5"
-    airframe="airframes/examples/microjet.xml"
-    radio="radios/cockpitMM.xml"
-    telemetry="telemetry/default_fixedwing.xml"
-    flight_plan="flight_plans/basic.xml"
-    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
-    gui_color="#6293ba"
-    />
-  <aircraft
-    name="Twog_IMU"
-    ac_id="7"
-    airframe="airframes/examples/twog_analogimu.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_fixedwing_imu.xml"
-    flight_plan="flight_plans/versatile.xml"
-    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
-    gui_color="blue"
-    />
-  <aircraft
-    name="Umarim_Lite"
-    ac_id="20"
-    airframe="airframes/examples/umarim_lite_v2.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_fixedwing_imu.xml"
-    flight_plan="flight_plans/basic.xml"
-    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
-    gui_color="blue"
-    />
-  <aircraft
-    name="Twinjet"
-    ac_id="6"
-    airframe="airframes/examples/twinjet.xml"
-    radio="radios/cockpitMM.xml"
-    telemetry="telemetry/default_fixedwing.xml"
-    flight_plan="flight_plans/versatile.xml"
-    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
-    gui_color="#ba6293"
-    />
-  <aircraft
-    name="EasyStar_ETS"
-    ac_id="8"
-    airframe="airframes/examples/easystar_ets.xml"
-    radio="radios/cockpitSX.xml"
-    telemetry="telemetry/default_fixedwing.xml"
-    flight_plan="flight_plans/basic.xml"
-    settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
-    gui_color="red"
-    />
   <aircraft
-   name="setup_lisam2"
-   ac_id="16"
-   airframe="airframes/examples/setup_lisam2.xml"
+   name="Quad_LisaM_2"
+   ac_id="162"
+   airframe="airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml"
    radio="radios/cockpitSX.xml"
-   telemetry="telemetry/dummy.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings=" settings/setup_actuators.xml"
-   gui_color="blue"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
+   gui_color="white"
   />
   <aircraft
-   name="ardrone2_sdk"
-   ac_id="200"
-   airframe="airframes/ardrone2_sdk.xml"
+   name="Quad_LisaS"
+   ac_id="163"
+   airframe="airframes/examples/quadrotor_lisa_s.xml"
    radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_ardrone.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml"
-   gui_color="blue"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
+   gui_color="white"
   />
   <aircraft
-   name="ardrone2_raw"
-   ac_id="201"
-   airframe="airframes/ardrone2_raw.xml"
+   name="Quad_NavGo"
+   ac_id="151"
+   airframe="airframes/examples/quadrotor_navgo.xml"
    radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_ardrone.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml settings/control/stabilization_att_int.xml"
-   gui_color="red"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml settings/modules/servo_switch.xml"
+   gui_color="white"
+  />
+  <aircraft
+   name="Twinjet"
+   ac_id="6"
+   airframe="airframes/examples/twinjet.xml"
+   radio="radios/cockpitMM.xml"
+   telemetry="telemetry/default_fixedwing.xml"
+   flight_plan="flight_plans/versatile.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   gui_color="#ba6293"
   />
-<aircraft
+  <aircraft
    name="Twinstar_energyadaptive"
    ac_id="13"
    airframe="airframes/examples/Twinstar_energyadaptive.xml"
@@ -175,6 +119,46 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_energyadaptive.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="Twog_IMU"
+   ac_id="7"
+   airframe="airframes/examples/twog_analogimu.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_fixedwing_imu.xml"
+   flight_plan="flight_plans/versatile.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
+   gui_color="blue"
+  />
+  <aircraft
+   name="Umarim_Lite"
+   ac_id="20"
+   airframe="airframes/examples/umarim_lite_v2.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_fixedwing_imu.xml"
+   flight_plan="flight_plans/basic.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
+   gui_color="blue"
+  />
+  <aircraft
+   name="ardrone2_raw"
+   ac_id="201"
+   airframe="airframes/ardrone2_raw.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_ardrone.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml settings/control/stabilization_att_int.xml"
+   gui_color="red"
+  />
+  <aircraft
+   name="ardrone2_sdk"
+   ac_id="200"
+   airframe="airframes/ardrone2_sdk.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_ardrone.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml"
+   gui_color="blue"
+  />
   <aircraft
    name="krooz_quad"
    ac_id="23"
@@ -185,4 +169,14 @@
    settings=" settings/rotorcraft_basic.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="setup_lisam2"
+   ac_id="16"
+   airframe="airframes/examples/setup_lisam2.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/dummy.xml"
+   flight_plan="flight_plans/dummy.xml"
+   settings=" settings/setup_actuators.xml"
+   gui_color="blue"
+  />
 </conf>