[conf] update settings_modules in example confs

paparazzi · Sep 26, 2016 · eca3d3b · eca3d3b
1 parent ef0c774
commit eca3d3b
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 71 deletions.
diff --git a/conf/conf_example.xml b/conf/conf_example.xml
@@ -18,7 +18,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
    settings="settings/rotorcraft_basic.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_euler.xml"
    gui_color="white"
   />
   <aircraft
@@ -29,7 +29,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/versatile.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/imu_common.xml modules/ahrs_float_dcm.xml modules/gps.xml"
    gui_color="blue"
   />
   <aircraft
@@ -39,8 +39,8 @@
    radio="radios/dummy.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/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/gps_ubx_ucenter.xml"
    gui_color="white"
   />
   <aircraft
@@ -51,7 +51,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml"
    gui_color="red"
   />
   <aircraft
@@ -62,7 +62,7 @@
    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"
-   settings_modules="modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_euler.xml"
    gui_color="white"
   />
   <aircraft
@@ -73,7 +73,7 @@
    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/superbitrf.xml settings/nps.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
    gui_color="white"
   />
   <aircraft
@@ -84,7 +84,7 @@
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile_airspeed.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_energy.xml settings/estimation/ac_char.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml"
+   settings_modules="modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml"
    gui_color="#ffffffffffff"
   />
   <aircraft
@@ -106,7 +106,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/nav_modules.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/control/ctl_dash_loiter_trim.xml settings/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/air_data.xml modules/nav_smooth.xml modules/nav_survey_poly_osam.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/nav_smooth.xml modules/nav_survey_poly_osam.xml"
    gui_color="blue"
   />
   <aircraft
@@ -127,8 +127,8 @@
    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/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_float_mlkf.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
    gui_color="white"
   />
   <aircraft
@@ -138,8 +138,8 @@
    radio="radios/dummy.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/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_float_mlkf.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
    gui_color="blue"
   />
   <aircraft
@@ -161,7 +161,7 @@
    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/superbitrf.xml settings/nps.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
    gui_color="white"
   />
   <aircraft
@@ -172,7 +172,7 @@
    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/nps.xml"
-   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml modules/digital_cam.xml modules/nav_survey_rectangle_rotorcraft.xml modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml modules/digital_cam.xml modules/nav_survey_rectangle_rotorcraft.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
    gui_color="white"
   />
   <aircraft
@@ -182,8 +182,8 @@
    radio="radios/dummy.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_indi.xml settings/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml [settings/control/stabilization_rate.xml] settings/control/stabilization_indi.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/gps_ubx_ucenter.xml"
    gui_color="#710080"
   />
   <aircraft
@@ -205,7 +205,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_energyadaptive.xml"
-   settings_modules="modules/gps.xml modules/imu_common.xml modules/air_data.xml modules/digital_cam.xml"
+   settings_modules="modules/gps.xml modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/digital_cam.xml"
    gui_color="blue"
   />
   <aircraft
@@ -216,7 +216,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/versatile.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/imu_common.xml modules/ahrs_float_dcm.xml modules/gps.xml"
    gui_color="blue"
   />
   <aircraft
@@ -227,7 +227,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml"
+   settings_modules="modules/imu_common.xml modules/ahrs_float_dcm.xml modules/gps.xml"
    gui_color="blue"
   />
   <aircraft
@@ -237,8 +237,8 @@
    radio="radios/dummy.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_quat.xml  settings/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml modules/video_rtp_stream.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int_quat.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft
@@ -248,8 +248,8 @@
    radio="radios/dummy.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_quat.xml settings/nps.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/geo_mag.xml modules/air_data.xml modules/video_rtp_stream.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int_quat.xml settings/nps.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_float_mlkf.xml modules/geo_mag.xml modules/air_data.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft
@@ -260,7 +260,7 @@
    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_indi.xml settings/control/rotorcraft_speed.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml [modules/geo_mag.xml] modules/air_data.xml modules/gps_ubx_ucenter.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml [modules/geo_mag.xml] modules/air_data.xml modules/gps_ubx_ucenter.xml"
    gui_color="red"
   />
   <aircraft
@@ -270,8 +270,8 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml  settings/control/stabilization_att_int.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml"
    gui_color="blue"
   />
   <aircraft
@@ -281,8 +281,8 @@
    radio="radios/dummy.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_indi.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_indi.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
    gui_color="blue"
   />
   <aircraft