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 30 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Felix Ruess
2011-11-24 15:45:52 +01:00
parent 83601512c4 7e9704edd0
commit 686a26b356
102 changed files with 911 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE airframe SYSTEM "../airframe.dtd">
<!--
<!--
YAPA + XSens + XBee
-->
conf/airframes/TU_Delft/MicrojetCDW.xml
-5
View File
@@ -184,11 +184,6 @@
<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
</section>
<section name="DATALINK" prefix="DATALINK_">
<define name="DEVICE_TYPE" value="XBEE"/>
<define name="DEVICE_ADDRESS" value="...."/>
</section>
<firmware name="fixedwing">
<target name="ap" board="tiny_1.1">
<configure name="PERIODIC_FREQUENCY" value="960"/> <!-- IMU FREQ -->
conf/airframes/TU_Delft/Trip50A.xml
-7
View File
@@ -231,13 +231,6 @@ inline static void h_ctl_roll_loop( void ) {
<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
</section>
<!--
<section name="DATALINK" prefix="DATALINK_">
<define name="DEVICE_TYPE" value="XBEE"/>
<define name="DEVICE_ADDRESS" value="0x005067361851"/>
</section>
-->
<section name="SIMU">
<define name="YAW_RESPONSE_FACTOR" value="0.5"/>
</section>
conf/airframes/TU_Delft/Trip50B.xml
-7
View File
@@ -236,13 +236,6 @@ inline static void h_ctl_roll_loop( void ) {
<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
</section>
<!--
<section name="DATALINK" prefix="DATALINK_">
<define name="DEVICE_TYPE" value="XBEE"/>
<define name="DEVICE_ADDRESS" value="0x005067361851"/>
</section>
-->
<section name="SIMU">
<define name="YAW_RESPONSE_FACTOR" value="0.5"/>
</section>
conf/airframes/TU_Delft/holiday50.xml
-7
View File
@@ -231,13 +231,6 @@ inline static void h_ctl_roll_loop( void ) {
<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
</section>
<!--
<section name="DATALINK" prefix="DATALINK_">
<define name="DEVICE_TYPE" value="AEROCOMM"/>
<define name="DEVICE_ADDRESS" value="0x005067361851"/>
</section>
-->
<section name="SIMU">
<define name="YAW_RESPONSE_FACTOR" value="0.5"/>
</section>
conf/airframes/TU_Delft/skywalkerfiber.xml
+7 -7
View File
@@ -1,6 +1,6 @@
<!DOCTYPE airframe SYSTEM "../airframe.dtd">
<!--
<!--
Skywalker Fiberglass "GraySky" FPV 168 (http://www..com/)
YAPA v2 (http://paparazzi.enac.fr/wiki/Yapa#Yapa_v2)
With modified power routing
@@ -51,7 +51,7 @@
<subsystem name="gps" type="ublox"/>
</firmware>
<!-- **************************** MODULES ********************************** -->
<!-- **************************** MODULES ********************************** -->
<modules>
<!-- <load name="light.xml">
<define name="LIGHT_LED_STROBE" value="3"/>
@@ -68,7 +68,7 @@
</load>
</modules>
<!-- ***************************** SERVOS ********************************** -->
<!-- ***************************** SERVOS ********************************** -->
<servos>
<!-- Define here to which CONNECTOR NUMBER the servo is connected to, on the autopilot cicuit board -->
<servo name="THROTTLE" no="9" min="1000" neutral="1000" max="2000"/>
@@ -85,7 +85,7 @@
<axis name="YAW" failsafe_value="0"/>
<axis name="PITCH" failsafe_value="0"/>
<!-- both ailerons up as braking spoilerons -->
<axis name="BRAKE" failsafe_value="9600"/>
<axis name="BRAKE" failsafe_value="9600"/>
</commands>
<rc_commands>
@@ -167,7 +167,7 @@
<!-- <define name="MilliAmpereOfAdc(adc)" value="((adc) - 505) * 124.0f"/> -->
<!-- Note that 3S lipo 3.1*3=9.3 most of the time the cutof for the motor part of the ESC -->
<define name="CATASTROPHIC_BAT_LEVEL" value="9.1" unit="V"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.1" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="10" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/>
@@ -250,7 +250,7 @@
<define name="GLIDE_PITCH" value="45" unit="deg"/>
</section>
<!-- ******************* VERTICAL CONTROL ********************************** -->
<!-- ******************* VERTICAL CONTROL ********************************** -->
<section name="VERTICAL CONTROL" prefix="V_CTL_">
<define name="POWER_CTL_BAT_NOMINAL" value="11.1" unit="volt"/>
<!-- outer loop proportional gain -->
@@ -272,7 +272,7 @@
<define name="THROTTLE_SLEW_LIMITER" value="2" unit="s"/>
</section>
<!-- ******************* HORIZONTAL CONTROL ******************************** -->
<!-- ******************* HORIZONTAL CONTROL ******************************** -->
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-1.16799998283"/>