[conf] update flixr airframes/conf

paparazzi · Sep 21, 2015 · 368f528 · 368f528
1 parent c8a497f
commit 368f528
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/conf/airframes/flixr/conf.xml b/conf/airframes/flixr/conf.xml
@@ -6,7 +6,7 @@
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml settings/nps.xml settings/persistent_settings.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/superbitrf.xml"
+   settings="settings/rotorcraft_basic.xml settings/nps.xml settings/persistent_settings.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/superbitrf.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/geo_mag.xml"
    gui_color="blue"
   />
@@ -18,8 +18,8 @@
    telemetry="telemetry/default_rotorcraft.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_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml"
    gui_color="blue"
-   settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_rtp_stream.xml"
   />
   <aircraft
    name="cc3d"
@@ -28,17 +28,17 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/demo.xml"
    flight_plan="flight_plans/dummy.xml"
-   settings="settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml [settings/test_actuators_pwm.xml]"
-   settings_modules=""
+   settings="settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml settings/test_actuators_pwm.xml"
    gui_color="blue"
+   settings_modules=""
   />
   <aircraft
    name="discovery"
    ac_id="9"
    airframe="airframes/flixr/flixr_discovery.xml"
    radio="radios/mc20.xml"
    telemetry="telemetry/default_fixedwing_imu.xml"
-   flight_plan="flight_plans/rotorcraft_basic.xml"
+   flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_new.xml"
    settings_modules="modules/servo_switch.xml"
    gui_color="blue"
@@ -50,7 +50,7 @@
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml"
+   settings="settings/rotorcraft_basic.xml settings/setup_actuators.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
    gui_color="blue"
   />

diff --git a/conf/airframes/flixr/flixr_discovery.xml b/conf/airframes/flixr/flixr_discovery.xml
@@ -55,7 +55,9 @@
 
   <firmware name="setup">
     <target name="tunnel"          board="twog_1.0" />
-    <target name="usb_tunnel"    board="twog_1.0"/>
+    <target name="usb_tunnel"    board="twog_1.0">
+       <configure name="TUNNEL_PORT" value="UART1"/>
+    </target>
   </firmware>
 
   <firmware name="test_progs">

diff --git a/conf/airframes/flixr/ladybird_lisa_s.xml b/conf/airframes/flixr/ladybird_lisa_s.xml
@@ -53,7 +53,7 @@
 
     <target name="nps" board="pc">
       <subsystem name="fdm" type="jsbsim"/>
-      <subsystem name="radio_control" type="ppm"/>
+      <subsystem name="radio_control" type="spektrum"/>
     </target>
 
     <subsystem name="motor_mixing"/>