From b435d6d3171eda0ff9354725f4b36a2af291576b Mon Sep 17 00:00:00 2001
From: dewagter <dewagter@gmail.com>
Date: Fri, 21 Nov 2014 17:02:20 +0100
Subject: [PATCH] removed bad airframes

---
 .../OpenUAS/conf_openuas_obc2014.xml          | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/conf/airframes/OpenUAS/conf_openuas_obc2014.xml b/conf/airframes/OpenUAS/conf_openuas_obc2014.xml
index b863c1dbbe6..cefdb726dc7 100644
--- a/conf/airframes/OpenUAS/conf_openuas_obc2014.xml
+++ b/conf/airframes/OpenUAS/conf_openuas_obc2014.xml
@@ -7,7 +7,7 @@
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml"
-   settings_modules=""
+   settings_modules="modules/nav_smooth.xml modules/infrared_adc.xml"
    gui_color="blue"
   />
   <aircraft
@@ -17,27 +17,8 @@
    radio="radios/spektrum.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/OpenUAS/openuas_obc2014_kingaroy.xml"
-   settings=" settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml settings/fixedwing_basic.xml"
+   settings="settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml settings/fixedwing_basic.xml"
+   settings_modules=""
    gui_color="#fffffac7c07a"
   />
-  <aircraft
-   name="VivifyMK2"
-   ac_id="218"
-   airframe="airframes/OpenUAS/openuas_vivify_mk1.xml"
-   radio="radios/spektrum_intermcu.xml"
-   telemetry="telemetry/xtend9k6.xml"
-   flight_plan="flight_plans/OpenUAS/openuas_obc2014_kingaroy.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml settings/modules/dc.xml settings/modules/ticket.xml settings/modules/landing.xml settings/modules/qnh.xml"
-   gui_color="#ffffe5ec67d1"
-  />
-  <aircraft
-   name="VivifyMK3"
-   ac_id="219"
-   airframe="airframes/OpenUAS/openuas_vivify_mk1.xml"
-   radio="radios/spektrum.xml"
-   telemetry="telemetry/default_fixedwing_imu_9k6.xml"
-   flight_plan="flight_plans/OpenUAS/openuas_simplesquare_airspeed_mbg.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml"
-   gui_color="#ffffe5ec67d1"
-  />
 </conf>