[paparazzi-commits] [4864] more stm32 changes

[antoine drouin]

Revision: 4864
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4864
Author:   poine
Date:     2010-04-24 02:55:57 +0000 (Sat, 24 Apr 2010)
Log Message:
-----------
more stm32 changes

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/booz2_a5.xml
    paparazzi3/trunk/conf/airframes/booz2_a6.xml

Modified: paparazzi3/trunk/conf/airframes/booz2_a5.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/booz2_a5.xml        2010-04-22 15:38:02 UTC 
(rev 4863)
+++ paparazzi3/trunk/conf/airframes/booz2_a5.xml        2010-04-24 02:55:57 UTC 
(rev 4864)
@@ -182,83 +182,11 @@
 
   <makefile>
 
-USER =
-HOST = overo
-TARGET_DIR = ~
-
-SRC_FMS=fms
-
 include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
 
-FLASH_MODE = IAP
-lpc_test_spi.ARCHDIR = arm7
-lpc_test_spi.ARCH = arm7tdmi
-lpc_test_spi.TARGET = lpc_test_spi
-lpc_test_spi.TARGETDIR = lpc_test_spi
-lpc_test_spi.srcs = $(SRC_FMS)/lpc_test_spi.c
-lpc_test_spi.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\"
-lpc_test_spi.CFLAGS += -DPERIPHERALS_AUTO_INIT
-lpc_test_spi.CFLAGS += -DUSE_LED
-lpc_test_spi.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
-lpc_test_spi.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' 
-DTIME_LED=1
-
-#
-# test BUSS BLDC
-#
-lpc_test_motors.ARCHDIR = arm7
-lpc_test_motors.ARCH = arm7tdmi
-lpc_test_motors.TARGET = lpc_test_motors
-lpc_test_motors.TARGETDIR = lpc_test_motors
-
-lpc_test_motors.CFLAGS += -DPERIPHERALS_AUTO_INIT
-lpc_test_motors.CFLAGS += -DBOARD_CONFIG=\"boards/booz2_v1_0.h\" -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
-lpc_test_motors.srcs += $(SRC_BOOZ_TEST)/booz2_test_buss_bldc_hexa.c
-lpc_test_motors.CFLAGS += -DUSE_LED
-lpc_test_motors.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' 
-DTIME_LED=1
-lpc_test_motors.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c
-
-lpc_test_motors.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
-lpc_test_motors.srcs += $(SRC_ARCH)/uart_hw.c
-
-lpc_test_motors.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart1
-lpc_test_motors.srcs += downlink.c pprz_transport.c
-
-lpc_test_motors.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart1
-lpc_test_motors.srcs += $(SRC_BOOZ)/booz2_datalink.c
-
-lpc_test_motors.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 
-DI2C0_VIC_SLOT=10
-lpc_test_motors.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
-
-
-
-#
-#
-#
-overo_test_telemetry.ARCHDIR = omap
-overo_test_telemetry.srcs=$(SRC_FMS)/overo_test_telemetry.c
-overo_test_telemetry.CFLAGS += -I$(GLIB_INC)
-overo_test_telemetry.LDFLAGS += -L$(GLIB_LIB) -lglib-2.0
-
-#
-#
-#
-overo_test_spi.ARCHDIR = omap
-overo_test_spi.srcs=$(SRC_FMS)/overo_test_spi.c
-
-
-
-#ap.ARCHDIR = $(ARCHI)
-#ap.LDFLAGS = -lm -levent -lrt
-#ap.CFLAGS += -I$(SRC_FMS)
-#ap.srcs=$(SRC_FMS)/fms_test_datalink.c
-#ap.CFLAGS += -DDOWNLINK
-#ap.CFLAGS += -DDOWNLINK_TRANSPORT=UdpTransport
-#ap.srcs += $(SRC_FMS)/fms_network.c
-#ap.srcs += $(SRC_FMS)/udp_transport.c
-#ap.srcs += downlink.c
-
 ARCH=lpc21
 BOARD_CFG = \"boards/booz2_v1_0.h\"
+ap.CFLAGS += -DMODEM_BAUD=B57600
 
 # prevents motors from ever starting
 #ap.CFLAGS += -DKILL_MOTORS
@@ -267,7 +195,6 @@
 include $(CFG_BOOZ)/booz2_autopilot.makefile
 include $(CFG_BOOZ)/booz2_test_progs.makefile
 
-ap.CFLAGS += -DMODEM_BAUD=B57600
 include $(CFG_BOOZ)/subsystems/booz2_radio_control_spektrum.makefile
 include $(CFG_BOOZ)/subsystems/booz2_actuators_mkk.makefile
 include $(CFG_BOOZ)/subsystems/booz2_imu_b2v1_1.makefile

Modified: paparazzi3/trunk/conf/airframes/booz2_a6.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/booz2_a6.xml        2010-04-22 15:38:02 UTC 
(rev 4863)
+++ paparazzi3/trunk/conf/airframes/booz2_a6.xml        2010-04-24 02:55:57 UTC 
(rev 4864)
@@ -46,21 +46,21 @@
     <define name="GYRO_R_SENS" value="-1.01" integer="16"/>
 
 
-    <define name="ACCEL_X_SENS" value="-2.53973936" integer="16"/>
-    <define name="ACCEL_Y_SENS" value="-2.58673329" integer="16"/>
-    <define name="ACCEL_Z_SENS" value="-2.58223257" integer="16"/>
+    <define name="ACCEL_X_SENS" value="-2.58273701242" integer="16"/>
+    <define name="ACCEL_Y_SENS" value="-2.54076215332" integer="16"/>
+    <define name="ACCEL_Z_SENS" value="-2.57633620646" integer="16"/>
 
-    <define name="ACCEL_X_NEUTRAL" value="32877"/>
-    <define name="ACCEL_Y_NEUTRAL" value="32415"/>
-    <define name="ACCEL_Z_NEUTRAL" value="32612"/>
+    <define name="ACCEL_X_NEUTRAL" value="32857"/>
+    <define name="ACCEL_Y_NEUTRAL" value="32429"/>
+    <define name="ACCEL_Z_NEUTRAL" value="32593"/>
 
-    <define name="MAG_X_SENS" value="5.00200577" integer="16"/>
-    <define name="MAG_Y_SENS" value="-4.68598036" integer="16"/>
-    <define name="MAG_Z_SENS" value="-2.98216964" integer="16"/>
+    <define name="MAG_X_SENS" value=" 5.32718104135" integer="16"/>
+    <define name="MAG_Y_SENS" value="-4.87857821202" integer="16"/>
+    <define name="MAG_Z_SENS" value="-3.11986612709" integer="16"/>
 
-    <define name="MAG_X_NEUTRAL" value="-47"/>
-    <define name="MAG_Y_NEUTRAL" value="24"/>
-    <define name="MAG_Z_NEUTRAL" value="28"/>
+    <define name="MAG_X_NEUTRAL" value="-43"/>
+    <define name="MAG_Y_NEUTRAL" value=" 49"/>
+    <define name="MAG_Z_NEUTRAL" value="-66"/>
 
     <define name="BODY_TO_IMU_PHI"   value="RadOfDeg(  0.)"/>
     <define name="BODY_TO_IMU_THETA" value="RadOfDeg(  0.)"/>