[conf] remove jsbsim from microjet, add krooz_quad to tests

paparazzi · May 21, 2014 · 0e99377 · 0e99377
1 parent 65a8246
commit 0e99377
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/conf/airframes/examples/microjet_lisa_m.xml b/conf/airframes/examples/microjet_lisa_m.xml
@@ -10,7 +10,6 @@
 
   <firmware name="fixedwing">
     <target name="sim" 	board="pc"/>
-    <target name="jsbsim" board="pc"/>
     <target name="nps"   board="pc">
       <subsystem name="fdm" type="jsbsim"/>
     </target>
@@ -199,11 +198,6 @@
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
   </section>
 
-  <section name="SIMU">
-    <define name="JSBSIM_MODEL" value="&quot;Malolo1&quot;"/>
-    <define name="JSBSIM_INIT"	value="&quot;Malolo1-IC&quot;"/>
-  </section>
-
   <section name="SIMULATOR" prefix="NPS_">
     <define name="JSBSIM_MODEL" value="&quot;Malolo1&quot;"/>
     <define name="JSBSIM_LAUNCHSPEED" value="20"/>

diff --git a/conf/conf_example.xml b/conf/conf_example.xml
@@ -56,7 +56,7 @@
    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"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
    gui_color="#6293ba"
   />
   <aircraft

diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
@@ -86,7 +86,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/dummy.xml"
-   settings="settings/fixedwing_basic.xml"
+   settings=" settings/fixedwing_basic.xml"
    gui_color="blue"
   />
   <aircraft
@@ -96,7 +96,7 @@
    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"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
    gui_color="white"
   />
   <aircraft
@@ -125,7 +125,7 @@
    airframe="airframes/examples/microjet_lisa_m.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing_imu.xml"
-   flight_plan="flight_plans/basic.xml"
+   flight_plan="flight_plans/nav_modules.xml"
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/ctl_dash_loiter_trim.xml"
    gui_color="blue"
   />
@@ -259,6 +259,16 @@
    settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="krooz_quad"
+   ac_id="23"
+   airframe="airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   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="lisa_l_chimu"
    ac_id="28"