Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

added the infrared_adc modules to airframes where it was missing after taking reading of infrared sensor out of ahrs_infrared

Browse Source
This commit is contained in:
Felix Ruess
2011-09-28 22:48:13 +02:00
parent aabda603a6
commit b6b8052049
35 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/CDW/LisaFw.xml
+1
View File
@@ -171,6 +171,7 @@
<define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
<define name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
</load>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="fixedwing">
conf/airframes/CDW/TinyFw.xml
+1
View File
@@ -166,6 +166,7 @@
<define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
<define name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
</load>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="fixedwing">
conf/airframes/ENAC/fixed-wing/merlin.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<!--subsystem name="ahrs" type="infrared"/-->
<subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/ENAC/fixed-wing/twinjet2.xml
+1
View File
@@ -20,6 +20,7 @@
</load>
<!--load name="enose.xml"/-->
<load name="light.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="fixedwing">
conf/airframes/LAAS/mmlaas_N1.xml
+6 -5
View File
@@ -23,11 +23,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="ahrs" type="infrared">
<configure name="ADC_IR1" value="ADC_1"/>
<configure name="ADC_IR2" value="ADC_0"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
@@ -43,6 +39,11 @@
<!-- <load name="tcas.xml"/> -->
<!--load name="potential.xml"/-->
<load name="cartography.xml"/>
<load name="infrared_adc.xml">
<configure name="ADC_IR1" value="ADC_1"/>
<configure name="ADC_IR2" value="ADC_0"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</load>
</modules>
conf/airframes/LAAS/mmlaas_N2.xml
+6 -5
View File
@@ -23,11 +23,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="ahrs" type="infrared">
<configure name="ADC_IR1" value="ADC_0"/>
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
@@ -42,6 +38,11 @@
<load name="formation_flight.xml"/>
<load name="tcas.xml"/>
<!--load name="potential.xml"/-->
<load name="infrared_adc.xml">
<configure name="ADC_IR1" value="ADC_0"/>
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</load>
</modules>
<!-- commands section -->
conf/airframes/LAAS/mmlaas_N3.xml
+6 -5
View File
@@ -23,11 +23,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="ahrs" type="infrared">
<configure name="ADC_IR1" value="ADC_0"/>
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
@@ -42,6 +38,11 @@
<load name="formation_flight.xml"/>
<load name="tcas.xml"/>
<!--load name="potential.xml"/-->
<load name="infrared_adc.xml">
<configure name="ADC_IR1" value="ADC_0"/>
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</load>
</modules>
<!-- commands section -->
conf/airframes/Poine/funjet42.xml
+4
View File
@@ -20,6 +20,10 @@
<subsystem name="navigation"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="lisa_l_test_progs">
<target name="tunnel" board="lisa_l_1.0"/>
<target name="test_led" board="lisa_l_1.0"/>
conf/airframes/Poine/swift_1.xml
+5 -1
View File
@@ -20,6 +20,10 @@
<subsystem name="navigation"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="lisa_l_test_progs">
<target name="test_led" board="lisa_m_1.0"/>
<target name="test_uart" board="lisa_m_1.0"/>
@@ -195,4 +199,4 @@
</airframe>
-->
-->
conf/airframes/TU_Delft/MicrojetBR.xml
+1
View File
@@ -232,6 +232,7 @@
<define name="LIGHT_LED_STROBE" value="3"/>
<define name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
</load>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="fixedwing">
conf/airframes/delta_wing_minimal_example.xml
+4
View File
@@ -22,6 +22,10 @@
<subsystem name="navigation"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="setup">
<target name="tunnel" board="tiny_2.11"/>
<target name="setup_actuators" board="tiny_2.11"/>
conf/airframes/easy_glider_example.xml
+1
View File
@@ -182,6 +182,7 @@
<load name="adc_generic.xml">
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_7"/> <!-- current sensor -->
</load>
<load name="infrared_adc.xml"/>
</modules>
</airframe>
conf/airframes/easystar_ets_example.xml
+1
View File
@@ -37,6 +37,7 @@
<modules>
<load name="airspeed_ets.xml"/>
<load name="baro_ets.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/funjet_cam_example.xml
+1
View File
@@ -48,6 +48,7 @@
<define name="DC_SHUTTER_LED" value="3"/>
</load>
<load name="sys_mon.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/funjet_example.xml
+3
View File
@@ -33,6 +33,9 @@
<subsystem name="navigation"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="setup">
<target name="tunnel" board="tiny_2.11"/>
conf/airframes/jsbsim.xml
+3
View File
@@ -222,6 +222,9 @@
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="setup">
<target name="tunnel" board="tiny_2.1" />
conf/airframes/mentor_tum.xml
+1
View File
@@ -41,6 +41,7 @@
<define name="SERVO_SWITCH_SERVO" value="SERVO_SWITCH"/>
</load>
<load name="sys_mon.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/microjet_example.xml
+4
View File
@@ -193,6 +193,10 @@
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="setup">
<target name="tunnel" board="tiny_1.1" />
conf/airframes/mm/extra/probe_t.xml
+1
View File
@@ -30,6 +30,7 @@
<!-- modules -->
<modules>
<load name="max11040.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/mm/extra/turbine_trigger.xml
+1
View File
@@ -23,6 +23,7 @@
<!-- modules -->
<modules>
<load name="trigger_ext.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<servos>
conf/airframes/mm/fixed-wing/drops.xml
+4
View File
@@ -32,6 +32,10 @@
</subsystem>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
<servos>
<servo name="MOTOR_LEFT" no="0" min="1000" neutral="1000" max="2000"/>
conf/airframes/mm/fixed-wing/funjet43.xml
+1
View File
@@ -30,6 +30,7 @@
<modules>
<load name="ins_arduimu.xml">
</load>
<!--load name="infrared_adc.xml"/-->
</modules>
<firmware name="lisa_l_test_progs">
conf/airframes/mm/fixed-wing/funjetdca.xml
+1
View File
@@ -51,6 +51,7 @@
<modules>
<!--load name="formation_flight.xml"/-->
<load name="tcas.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/mm/fixed-wing/funjetdcb.xml
+1
View File
@@ -51,6 +51,7 @@
<modules>
<!--load name="formation_flight.xml"/-->
<load name="tcas.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/mm/fixed-wing/funjetdcc.xml
+1
View File
@@ -51,6 +51,7 @@
<modules>
<!--load name="formation_flight.xml"/-->
<load name="tcas.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/mm/fixed-wing/funjetgfi8.xml
+1
View File
@@ -40,6 +40,7 @@
<modules>
<load name="baro_scp.xml"/>
<load name="humid_sht.xml"/>
<load name="infrared_adc.xml"/>
</modules>
<firmware name="setup">
conf/airframes/mm/fixed-wing/funjetlisa.xml
+3 -1
View File
@@ -45,7 +45,9 @@
<target name="test_actuators_asctecv1" board="lisa_l_1.0"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<servos>
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
conf/airframes/mm/fixed-wing/funjetlisam.xml
+3 -1
View File
@@ -45,7 +45,9 @@
<target name="test_actuators_asctecv1" board="lisa_l_1.0"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<servos>
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
conf/airframes/mm/fixed-wing/funjetmm.xml
+1
View File
@@ -73,6 +73,7 @@
<load name="humid_sht_i2c.xml"/>
<load name="mag_micromag_fw.xml"/>
<load name="baro_scp_i2c.xml"/-->
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/mm/fixed-wing/slowfast.xml
+4
View File
@@ -31,6 +31,10 @@
</subsystem>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
<servos>
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
conf/airframes/mm/fixed-wing/slowfast2.xml
+1
View File
@@ -38,6 +38,7 @@
<!--param name="USE_AIRSPEED" value="1"/-->
<param name="SENSOR_SYNC_SEND" value="1"/>
</load>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
conf/airframes/twinjet_example.xml
+1
View File
@@ -38,6 +38,7 @@
<load name="adc_generic.xml">
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_7" />
</load>
<load name="infrared_adc.xml"/>
</modules>
<servos>
conf/airframes/twinjet_overo.xml
+1
View File
@@ -44,6 +44,7 @@
<flag name="USE_ADC_3"/>
<flag name="USE_ADC_5"/>
</load>
<load name="infrared_adc.xml"/>
</modules>
<servos>
conf/airframes/twinstar_example.xml
+4
View File
@@ -32,6 +32,10 @@
<target name="setup_actuators" board="twog_1.0"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
<servos>
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
conf/airframes/usb_test.xml
+4
View File
@@ -26,6 +26,10 @@
<target name="setup_actuators" board="tiny_2.11"/>
</firmware>
<modules>
<load name="infrared_adc.xml"/>
</modules>
<!-- commands section -->
<servos>
<servo name="MOTOR" no="0" min="1550" neutral="1550" max="2000"/>