[paparazzi-commits] [5477] update microjet airframes

[Felix Ruess]

Revision: 5477
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5477
Author:   flixr
Date:     2010-08-19 12:45:41 +0000 (Thu, 19 Aug 2010)
Log Message:
-----------
update microjet airframes

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/microjet_raw_makefile.xml
    paparazzi3/trunk/conf/airframes/microjet_xml_only.xml

Modified: paparazzi3/trunk/conf/airframes/microjet_raw_makefile.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_raw_makefile.xml   2010-08-19 
12:32:47 UTC (rev 5476)
+++ paparazzi3/trunk/conf/airframes/microjet_raw_makefile.xml   2010-08-19 
12:45:41 UTC (rev 5477)
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "./airframe.dtd">
 
 <!-- 
      Microjet Multiplex (http://www.multiplex-rc.de/)
@@ -49,6 +49,17 @@
     <define name="MAX_PITCH" value="0.6"/>
   </section>
 
+  <section name="adc" prefix="ADC_CHANNEL_">
+    <define name="IR1" value="ADC_1"/>
+    <define name="IR2" value="ADC_2"/>
+    <define name="IR_TOP" value="ADC_0"/>
+    <define name="IR_NB_SAMPLES" value="16"/>
+
+    <define name="GYRO_ROLL" value="ADC_3"/>
+    <define name="GYRO_NB_SAMPLES" value="16"/>
+
+  </section>
+
   <section name="INFRARED" prefix="IR_">
     <define name="ADC_IR1_NEUTRAL" value="512"/>
     <define name="ADC_IR2_NEUTRAL" value="512"/>

Modified: paparazzi3/trunk/conf/airframes/microjet_xml_only.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_xml_only.xml       2010-08-19 
12:32:47 UTC (rev 5476)
+++ paparazzi3/trunk/conf/airframes/microjet_xml_only.xml       2010-08-19 
12:45:41 UTC (rev 5477)
@@ -1,6 +1,6 @@
-<!DOCTYPE airframe SYSTEM "../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "./airframe.dtd">
 
-<!-- 
+<!--
      Microjet Multiplex (http://www.multiplex-rc.de/)
      Tiny 2.11 board (http://paparazzi.enac.fr/wiki/Tiny_v2)
      Tilted infrared sensor
@@ -38,7 +38,7 @@
 
   <command_laws>
     <let var="aileron"  value="@ROLL  * AILEVON_AILERON_RATE"/>
-    <let var="elevator" value="@PITCH * AILEVON_ELEVATOR_RATE"/>  
+    <let var="elevator" value="@PITCH * AILEVON_ELEVATOR_RATE"/>
     <set servo="MOTOR"           value="@THROTTLE"/>
     <set servo="AILEVON_LEFT"  value="$elevator + $aileron"/>
     <set servo="AILEVON_RIGHT" value="$elevator - $aileron"/>
@@ -73,13 +73,13 @@
 
  <section name="GYRO" prefix="GYRO_">
     <define name="ADC_ROLL_NEUTRAL" value="520"/>
-    <define name="ADC_TEMP_NEUTRAL" value="476"/>   
-    <define name="ADC_TEMP_SLOPE" value="0"/>  
+    <define name="ADC_TEMP_NEUTRAL" value="476"/>
+    <define name="ADC_TEMP_SLOPE" value="0"/>
     <define name="DYNAMIC_RANGE" value="300" unit="deg/s"/>
     <define name="ADXRS300_RESISTOR_BRIDGE" value="(3.3/(3.3+1.8))"/>
     <define name="ADXRS300_SENSITIVITY" value="5" unit="mV/(deg/s)"/>
     <define name="ROLL_SCALE" 
value="3.3*1000./1024./(GYRO_ADXRS300_SENSITIVITY*GYRO_ADXRS300_RESISTOR_BRIDGE)"
 unit="deg/s/adc_unit"/>
-    <define name="ROLL_DIRECTION" value="-1."/> 
+    <define name="ROLL_DIRECTION" value="-1."/>
   </section>
 
   <section name="BAT">
@@ -87,7 +87,7 @@
 
     <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
   </section>
- 
+
   <section name="MISC">
     <define name="MINIMUM_AIRSPEED" value="12." unit="m/s"/>
     <define name="NOMINAL_AIRSPEED" value="15." unit="m/s"/>
@@ -100,7 +100,7 @@
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
     <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
- 
+
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
 
     <!-- outer loop proportional gain -->
@@ -157,11 +157,11 @@
     </section>
 
   <section name="FAILSAFE" prefix="FAILSAFE_">
-       <define name="DELAY_WITHOUT_GPS" value="1" unit="s"/>
-       <define name="DEFAULT_THROTTLE" value="0.3" unit="%"/>
-       <define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
-       <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
-       <define name="HOME_RADIUS" value="100" unit="m"/>
+    <define name="DELAY_WITHOUT_GPS" value="1" unit="s"/>
+        <define name="DEFAULT_THROTTLE" value="0.3" unit="%"/>
+        <define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
+        <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
+    <define name="HOME_RADIUS" value="100" unit="m"/>
   </section>
 
   <target name="fixedwing" board="tiny_2.11">