[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5098] update enac quad conf files (new sign definit
|
From: |
Gautier Hattenberger |
|
Subject: |
[paparazzi-commits] [5098] update enac quad conf files (new sign definition for imu sensitivity ) |
|
Date: |
Wed, 21 Jul 2010 16:41:10 +0000 |
Revision: 5098
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5098
Author: gautier
Date: 2010-07-21 16:41:10 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
update enac quad conf files (new sign definition for imu sensitivity)
Modified Paths:
--------------
paparazzi3/trunk/conf/airframes/ENAC/quadrotor/booz2_g1.xml
paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mini.xml
paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mkk1.xml
Modified: paparazzi3/trunk/conf/airframes/ENAC/quadrotor/booz2_g1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/quadrotor/booz2_g1.xml 2010-07-21
16:40:25 UTC (rev 5097)
+++ paparazzi3/trunk/conf/airframes/ENAC/quadrotor/booz2_g1.xml 2010-07-21
16:41:10 UTC (rev 5098)
@@ -1,9 +1,10 @@
<airframe name="BOOZ2_G1">
<modules main_freq="512">
- <!--load name="booz_drop.xml"/-->
- <load name="booz_cam.xml"/>
+ <load name="booz_drop.xml"/>
+ <!--load name="booz_cam.xml"/-->
<!--load name="sonar_maxbotix_booz.xml"/-->
+ <!--load name="adc_generic_booz.xml"/-->
</modules>
<servos min="0" neutral="0" max="0xff">
@@ -36,17 +37,17 @@
<define name="GYRO_Q_NEUTRAL" value="32391"/>
<define name="GYRO_R_NEUTRAL" value="32853"/>
- <define name="GYRO_P_SENS" value=" 1.00" integer="16"/>
- <define name="GYRO_Q_SENS" value="-1.00" integer="16"/>
- <define name="GYRO_R_SENS" value="-1.00" integer="16"/>
+ <define name="GYRO_P_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_Q_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_R_SENS" value="1.00" integer="16"/>
<define name="ACCEL_X_CHAN" value="5"/>
<define name="ACCEL_Y_CHAN" value="3"/>
<define name="ACCEL_Z_CHAN" value="4"/>
- <define name="ACCEL_X_SENS" value="-2.55975587" integer="16"/>
- <define name="ACCEL_Y_SENS" value="-2.55643340" integer="16"/>
- <define name="ACCEL_Z_SENS" value="-2.57178460" integer="16"/>
+ <define name="ACCEL_X_SENS" value="2.55975587" integer="16"/>
+ <define name="ACCEL_Y_SENS" value="2.55643340" integer="16"/>
+ <define name="ACCEL_Z_SENS" value="2.57178460" integer="16"/>
<define name="ACCEL_X_NEUTRAL" value="33067"/>
<define name="ACCEL_Y_NEUTRAL" value="32778"/>
@@ -61,12 +62,12 @@
<define name="MAG_Z_NEUTRAL" value="-11"/>
<define name="MAG_X_SENS" value="22.008352" integer="16"/>
- <define name="MAG_Y_SENS" value="-21.79885" integer="16"/>
- <define name="MAG_Z_SENS" value="-14.675745" integer="16"/>
+ <define name="MAG_Y_SENS" value="21.79885" integer="16"/>
+ <define name="MAG_Z_SENS" value="14.675745" integer="16"/>
- <define name="BODY_TO_IMU_PHI"
value="ANGLE_BFP_OF_REAL(RadOfDeg(-0.2))"/>
- <define name="BODY_TO_IMU_THETA" value="ANGLE_BFP_OF_REAL(RadOfDeg(1.))"/>
- <define name="BODY_TO_IMU_PSI" value="ANGLE_BFP_OF_REAL(RadOfDeg(0.))"/>
+ <define name="BODY_TO_IMU_PHI" value="RadOfDeg(1.3)"/>
+ <define name="BODY_TO_IMU_THETA" value="RadOfDeg(-2.6)"/>
+ <define name="BODY_TO_IMU_PSI" value="RadOfDeg(0.)"/>
</section>
@@ -165,7 +166,7 @@
<section name="BAT">
<define name="MILLIAMP_PER_PERCENT" value="0.86"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
- <define name="BATTERY_SENS" value="0.25" integer="16"/>
+ <define name="BATTERY_SENS" value="0.183" integer="16"/>
</section>
<section name="AUTOPILOT">
@@ -175,7 +176,7 @@
</section>
<section name="FMS">
-
+ <define name="BOOZ_FMS_TIMEOUT" value="0"/>
</section>
<section name="CAM" prefix="BOOZ_CAM_">
@@ -195,6 +196,12 @@
<define name="DEFAULT_CIRCLE_RADIUS" value="10."/>
</section>
+ <section name="GCS">
+ <define name="ALT_SHIFT_PLUS_PLUS" value="5"/>
+ <define name="ALT_SHIFT_PLUS" value="1"/>
+ <define name="ALT_SHIFT_MINUS" value="-1"/>
+ </section>
+
<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{"front_motor",
"back_motor", "right_motor", "left_motor"}"/>
<!--define name="INITIAL_CONDITITONS" value=""reset_enac""/-->
@@ -204,7 +211,9 @@
<makefile>
ARCH=lpc21
+ARCHI=arm7
BOARD_CFG = \"boards/booz2_v1_0.h\"
+FLASH_MODE=IAP
# prevents motors from ever starting
#ap.CFLAGS += -DKILL_MOTORS
@@ -228,12 +237,12 @@
include $(CFG_BOOZ)/subsystems/booz2_ahrs_cmpl.makefile
-#include $(CFG_BOOZ)/subsystems/booz2_ins_hff.makefile
+include $(CFG_BOOZ)/subsystems/booz2_ins_hff.makefile
#set GPS lag for horizontal filter
#ap.CFLAGS += -DGPS_LAG=0.8
-#ap.CFLAGS += -DUSE_GPS_ACC4R
+ap.CFLAGS += -DUSE_GPS_ACC4R
-#ap.CFLAGS += -DB2_GUIDANCE_H_USE_REF
+ap.CFLAGS += -DB2_GUIDANCE_H_USE_REF
sim.CFLAGS += -DB2_GUIDANCE_H_USE_REF
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
Modified: paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mini.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mini.xml 2010-07-21
16:40:25 UTC (rev 5097)
+++ paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mini.xml 2010-07-21
16:41:10 UTC (rev 5098)
@@ -30,9 +30,9 @@
<define name="GYRO_Q_NEUTRAL" value="32440"/>
<define name="GYRO_R_NEUTRAL" value="33033"/>
- <define name="GYRO_P_SENS" value=" 1.00" integer="16"/>
- <define name="GYRO_Q_SENS" value="-1.00" integer="16"/>
- <define name="GYRO_R_SENS" value="-1.00" integer="16"/>
+ <define name="GYRO_P_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_Q_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_R_SENS" value="1.00" integer="16"/>
<define name="ACCEL_X_CHAN" value="5"/>
<define name="ACCEL_Y_CHAN" value="3"/>
@@ -42,9 +42,9 @@
<define name="ACCEL_Y_NEUTRAL" value="32251"/>
<define name="ACCEL_Z_NEUTRAL" value="32463"/>
- <define name="ACCEL_X_SENS" value="-2.59502439625" integer="16"/>
- <define name="ACCEL_Y_SENS" value="-2.57636806334" integer="16"/>
- <define name="ACCEL_Z_SENS" value="-2.59680479039" integer="16"/>
+ <define name="ACCEL_X_SENS" value="2.59502439625" integer="16"/>
+ <define name="ACCEL_Y_SENS" value="2.57636806334" integer="16"/>
+ <define name="ACCEL_Z_SENS" value="2.59680479039" integer="16"/>
<define name="MAG_X_CHAN" value="0"/>
<define name="MAG_Y_CHAN" value="1"/>
@@ -55,12 +55,12 @@
<define name="MAG_Z_NEUTRAL" value="7"/>
<define name="MAG_X_SENS" value="5.50726991669" integer="16"/>
- <define name="MAG_Y_SENS" value="-5.43740121157" integer="16"/>
- <define name="MAG_Z_SENS" value="-2.60492836649" integer="16"/>
+ <define name="MAG_Y_SENS" value="5.43740121157" integer="16"/>
+ <define name="MAG_Z_SENS" value="2.60492836649" integer="16"/>
<define name="BODY_TO_IMU_PHI" value="RadOfDeg(-1.5)"/>
<define name="BODY_TO_IMU_THETA" value="RadOfDeg(-1.5)"/>
- <define name="BODY_TO_IMU_PSI" value="RadOfDeg(-45.)"/>
+ <define name="BODY_TO_IMU_PSI" value="RadOfDeg(-45)"/> <!-- -13 -->
</section>
@@ -101,13 +101,13 @@
<define name="REF_MAX_RDOT" value="RadOfDeg(900.)"/>
<!-- feedback -->
- <define name="PHI_PGAIN" value="-1000"/>
- <define name="PHI_DGAIN" value="-250"/>
- <define name="PHI_IGAIN" value="-40"/>
+ <define name="PHI_PGAIN" value="-1500"/>
+ <define name="PHI_DGAIN" value="-350"/>
+ <define name="PHI_IGAIN" value="-50"/>
- <define name="THETA_PGAIN" value="-1000"/>
- <define name="THETA_DGAIN" value="-250"/>
- <define name="THETA_IGAIN" value="-40"/>
+ <define name="THETA_PGAIN" value="-1500"/>
+ <define name="THETA_DGAIN" value="-350"/>
+ <define name="THETA_IGAIN" value="-50"/>
<define name="PSI_PGAIN" value="-1000"/>
<define name="PSI_DGAIN" value="-350"/>
@@ -153,9 +153,9 @@
</section>
<section name="GUIDANCE_H" prefix="BOOZ2_GUIDANCE_H_">
- <define name="PGAIN" value="-100"/>
- <define name="DGAIN" value="-100"/>
- <define name="IGAIN" value="-0"/>
+ <define name="PGAIN" value="-140"/>
+ <define name="DGAIN" value="-90"/>
+ <define name="IGAIN" value="-30"/>
<define name="NGAIN" value="-0"/>
<!-- feedforward -->
<define name="AGAIN" value="100"/>
@@ -186,6 +186,7 @@
<define name="PAN_NEUTRAL" value="0"/>
<define name="PAN_MIN" value="0"/>
<define name="PAN_MAX" value="25736"/> <!-- 360 deg (2^12) -->
+ <define name="DEFAULT_MODE" value="BOOZ_CAM_MODE_MANUAL"/>
<!--define name="SetPwm(_v)" value="Booz2SetPwm1Value(_v)"/-->
</section>
@@ -195,8 +196,15 @@
<define name="BOOZ2_FACE_REINJ_1" value="1024"/>
<define name="DEFAULT_CIRCLE_RADIUS" value="10."/>
<define name="BoozDropPwm(_v)" value="Booz2SetPwm1Value(_v)"/>
+ <define name="IMU_MAG_OFFSET" value="-9."/>
</section>
+ <section name="GCS">
+ <define name="ALT_SHIFT_PLUS_PLUS" value="5"/>
+ <define name="ALT_SHIFT_PLUS" value="1"/>
+ <define name="ALT_SHIFT_MINUS" value="-1"/>
+ </section>
+
<makefile>
ARCH=lpc21
ARCHI=arm7
@@ -227,6 +235,7 @@
ap.CFLAGS += -DB2_GUIDANCE_H_USE_REF
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
-DUSE_PWM1
+ap.CFLAGS += -DBOOZ_ACTUATORS_MAX_THRUST=160 -DBOOZ_THRUST_LOWPASS=17
ap.srcs += $(SRC_BOOZ_ARCH)/booz2_pwm_hw.c
Modified: paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mkk1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mkk1.xml 2010-07-21
16:40:25 UTC (rev 5097)
+++ paparazzi3/trunk/conf/airframes/ENAC/quadrotor/mkk1.xml 2010-07-21
16:41:10 UTC (rev 5098)
@@ -45,9 +45,9 @@
<define name="GYRO_Q_NEUTRAL" value="33253"/>
<define name="GYRO_R_NEUTRAL" value="32329"/>
- <define name="GYRO_P_SENS" value=" 1.00" integer="16"/>
- <define name="GYRO_Q_SENS" value="-1.00" integer="16"/>
- <define name="GYRO_R_SENS" value="-1.00" integer="16"/>
+ <define name="GYRO_P_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_Q_SENS" value="1.00" integer="16"/>
+ <define name="GYRO_R_SENS" value="1.00" integer="16"/>
<define name="ACCEL_X_CHAN" value="5"/>
<define name="ACCEL_Y_CHAN" value="3"/>
@@ -57,9 +57,9 @@
<define name="ACCEL_Y_NEUTRAL" value="33032"/>
<define name="ACCEL_Z_NEUTRAL" value="32843"/>
- <define name="ACCEL_X_SENS" value="-2.5749914646" integer="16"/>
- <define name="ACCEL_Y_SENS" value="-2.56940516083" integer="16"/>
- <define name="ACCEL_Z_SENS" value="-2.56940374188" integer="16"/>
+ <define name="ACCEL_X_SENS" value="2.5749914646" integer="16"/>
+ <define name="ACCEL_Y_SENS" value="2.56940516083" integer="16"/>
+ <define name="ACCEL_Z_SENS" value="2.56940374188" integer="16"/>
<define name="MAG_X_CHAN" value="0"/>
<define name="MAG_Y_CHAN" value="1"/>
@@ -70,8 +70,8 @@
<define name="MAG_Z_NEUTRAL" value="-95"/>
<define name="MAG_X_SENS" value="6.42348671436" integer="16"/>
- <define name="MAG_Y_SENS" value="-6.95371185551" integer="16"/>
- <define name="MAG_Z_SENS" value="-3.12322557454" integer="16"/>
+ <define name="MAG_Y_SENS" value="6.95371185551" integer="16"/>
+ <define name="MAG_Z_SENS" value="3.12322557454" integer="16"/>
<!--define name="MAG_X_NEUTRAL" value="-12"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [5098] update enac quad conf files (new sign definition for imu sensitivity ),
Gautier Hattenberger <=