Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-21 20:04:09 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Felix Ruess
2011-07-17 13:04:10 +02:00
parent 7b1621b24d 2cf36923f5
commit ad38a3717d
68 changed files with 234 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/CDW/ChimuLisaFw.xml
+1 -1
View File
@@ -196,7 +196,7 @@
<subsystem name="control"/>
<!-- Sensors
<subsystem name="gyro" type="roll"/> -->
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/CDW/ChimuTinyFw.xml
+2 -2
View File
@@ -176,7 +176,7 @@
<target name="sim" board="pc"/>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="gps" type="ublox_lea5h" >
<subsystem name="gps" type="ublox" >
<configure name="GPS_PORT" value="gps_i2c" />
</subsystem>
@@ -189,7 +189,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="navigation"/>
<!-- <subsystem name="gps" type="ublox_lea5h"/> -->
<!-- <subsystem name="gps" type="ublox"/> -->
<!--<subsystem name="i2c"/>-->
conf/airframes/CDW/ChimuTinyFwSpi.xml
+2 -2
View File
@@ -175,7 +175,7 @@
<target name="sim" board="pc"/>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="gps" type="ublox_lea5h" />
<subsystem name="gps" type="ublox" />
<!-- Communication -->
<subsystem name="telemetry" type="xbee_api">
@@ -186,7 +186,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="navigation"/>
<!-- <subsystem name="gps" type="ublox_lea5h"/> -->
<!-- <subsystem name="gps" type="ublox"/> -->
<subsystem name="spi_slave_hs"/>
conf/airframes/CDW/LisaFw.xml
+1 -1
View File
@@ -200,7 +200,7 @@
<configure name="ADC_IR_NB_SAMPLES" value="16"/>
</subsystem>-->
<subsystem name="gps" type="ublox_lea4p">
<subsystem name="gps" type="ublox_utm">
<configure name="GPS_PORT" value="UART1"/>
</subsystem>
conf/airframes/CDW/TinyFw.xml
+1 -1
View File
@@ -187,7 +187,7 @@
<!-- Sensors -->
<subsystem name="gyro" type="roll"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/ENAC/fixed-wing/funjet2.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<!-- Actuators are automatically chosen according to board-->
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="gyro" type="roll">
<configure name="ADC_GYRO_ROLL" value="ADC_5"/>
</subsystem>
conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<!-- Actuators are automatically chosen according to board-->
<subsystem name="control" type="new"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="gyro" type="roll">
<configure name="ADC_GYRO_ROLL" value="ADC_5"/>
</subsystem>
conf/airframes/ENAC/fixed-wing/funjet2_new.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<!-- Actuators are automatically chosen according to board-->
<subsystem name="control" type="new"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="gyro" type="roll">
<configure name="ADC_GYRO_ROLL" value="ADC_5"/>
</subsystem>
conf/airframes/ENAC/fixed-wing/funjet3.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<subsystem name="control" type="new"/>
<subsystem name="navigation"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
</firmware>
conf/airframes/ENAC/fixed-wing/merlin.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<!--subsystem name="attitude" type="infrared"/-->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/ENAC/fixed-wing/minimag1.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<subsystem name="navigation" />
<!-- <subsystem name="attitude" type="infrared"/>-->
<subsystem name="control"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
</firmware>
<firmware name="setup">
conf/airframes/ENAC/fixed-wing/spocIII-1.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<!-- Actuators are automatically chosen according to board-->
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!--subsystem name="current_sensor">
<configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
conf/airframes/ENAC/fixed-wing/spocIII-2.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<subsystem name="radio_control" type="datalink"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!--subsystem name="current_sensor">
<configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
conf/airframes/ENAC/fixed-wing/spocIII-3.xml
+1 -1
View File
@@ -43,7 +43,7 @@
<subsystem name="radio_control" type="datalink"/>
<!-- Sensors -->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="current_sensor">
<configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
conf/airframes/ENAC/fixed-wing/twinjet2.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control" type="new"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="i2c"/>
</firmware>
conf/airframes/LAAS/mmlaas_N1.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<configure name="ADC_IR2" value="ADC_0"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/LAAS/mmlaas_N2.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/LAAS/mmlaas_N3.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<configure name="ADC_IR2" value="ADC_1"/>
<configure name="ADC_IR_TOP" value="ADC_2"/>
</subsystem>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
+1 -1
View File
@@ -260,7 +260,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="navigation"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="i2c"/>
conf/airframes/Poine/funjet42.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/Poine/swift_1.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/TU_Delft/MicrojetBR.xml
+1 -1
View File
@@ -261,7 +261,7 @@
<configure name="ADC_GYRO_ROLL" value="ADC_3" />
</subsystem>
--> <subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="control" />
<subsystem name="navigation" type="extra"/>
conf/airframes/TU_Delft/MicrojetBRimu.xml
+1 -1
View File
@@ -298,7 +298,7 @@
<subsystem name="ahrs" type="dcm"/>
<subsystem name="i2c"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="control" />
<subsystem name="navigation" />
conf/airframes/TU_Delft/MicrojetCDW.xml
+1 -1
View File
@@ -215,7 +215,7 @@
<!-- Sensors -->
<subsystem name="imu" type="booz"/>
<subsystem name="ahrs" type="dcm"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/delta_wing_minimal_example.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/easy_glider_example.xml
+1 -1
View File
@@ -169,7 +169,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/easystar_ets_example.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/>
<subsystem name="i2c"/>
</firmware>
conf/airframes/easystar_example.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/example_twog_analogimu.xml
+1 -1
View File
@@ -213,7 +213,7 @@
</subsystem>
<subsystem name="ahrs" type="dcm"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/flixr_discovery.xml
+1 -1
View File
@@ -42,7 +42,7 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
<!-- Sensors -->
<subsystem name="imu" type="booz"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="current_sensor">
<configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
</subsystem>
conf/airframes/funjet_cam_example.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/>
</firmware>
conf/airframes/funjet_example.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/jsbsim.xml
+1 -1
View File
@@ -217,7 +217,7 @@
<!-- Sensors -->
<subsystem name="gyro" type="roll"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/mentor_tum.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/>
</firmware>
conf/airframes/microjet_example.xml
+1 -1
View File
@@ -197,7 +197,7 @@
<!-- Sensors -->
<subsystem name="gyro" type="roll"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/mm/extra/probe_t.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/mm/extra/turbine_trigger.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>
conf/airframes/mm/fixed-wing/drops.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control_adaptive"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="navigation_bomb"/>
conf/airframes/mm/fixed-wing/funjet43.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<!--subsystem name="attitude" type="infrared"/-->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<!-- Interfaces -->
<subsystem name="i2c"/>
conf/airframes/mm/fixed-wing/funjetdca.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/funjetdcb.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/funjetdcc.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/funjetgfi8.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/funjetlisa.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h">
<subsystem name="gps" type="ublox">
<configure name="GPS_PORT" value="UART3"/>
</subsystem>
<subsystem name="navigation"/>
conf/airframes/mm/fixed-wing/funjetlisam.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h">
<subsystem name="gps" type="ublox">
<configure name="GPS_PORT" value="UART3"/>
</subsystem>
<subsystem name="navigation"/>
conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<!--subsystem name="attitude" type="infrared"/-->
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/merlin.xml
+1 -1
View File
@@ -182,7 +182,7 @@
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="gps" type="ublox_utm"/>
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
conf/airframes/mm/fixed-wing/slowfast.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="gyro" type="roll">
conf/airframes/mm/fixed-wing/slowfast2.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="i2c"/>
conf/airframes/test_hb.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<!-- Sensors -->
<subsystem name="imu" type="hb"/>
<subsystem name="gps" type="ublox_lea5h"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
</firmware>

Some files were not shown because too many files have changed in this diff Show More