Merge pull request #383 from paparazzi/fix_stm32_spi

fixes for STM32 SPI transactions: can handle zero input or output lengths now, max1168 works again...
paparazzi · Mar 2, 2013 · 9cbc44d · 9cbc44d
2 parents 3e7a18c + f1b5656
commit 9cbc44d
Show file tree

Hide file tree

Showing 11 changed files with 544 additions and 512 deletions.
diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
@@ -33,17 +33,19 @@
         <subsystem name="stabilization"   type="euler"/>
         <subsystem name="ahrs"            type="int_cmpl_quat"/>
         <subsystem name="ins"/>
-        <define name="HMC5843_USE_INT"/>
+        <define name="PRINT_CONFIG"/>
     </firmware>
 
     <firmware name="lisa_test_progs">
+        <define name="PRINT_CONFIG"/>
         <target name="test_led"           board="lisa_l_1.1"/>
         <target name="test_uart"          board="lisa_l_1.1"/>
         <target name="test_servos"        board="lisa_l_1.1"/>
         <target name="test_telemetry"     board="lisa_l_1.1"/>
         <target name="test_baro"          board="lisa_l_1.1"/>
-        <target name="test_imu_b2_2"      board="lisa_l_1.1"/>
         <target name="test_imu_b2_nomag"  board="lisa_l_1.1"/>
+        <target name="test_imu_b2"        board="lisa_l_1.1"/>
+        <target name="test_imu_b2_2"      board="lisa_l_1.1"/>
         <target name="test_rc_spektrum"   board="lisa_l_1.1"/>
         <target name="test_rc_ppm"        board="lisa_l_1.1"/>
         <target name="test_adc"           board="lisa_l_1.1"/>

diff --git a/conf/firmwares/lisa_test_progs.makefile b/conf/firmwares/lisa_test_progs.makefile
@@ -361,10 +361,10 @@ test_imu_b2.srcs   += $(IMU_B2_SRCS)
 #
 IMU_B2_2_CFLAGS  = -DIMU_B2_VERSION_1_2
 # mag stuff
-IMU_B2_2_CFLAGS += -DUSE_I2C2
+IMU_B2_2_CFLAGS += -DIMU_B2_I2C_DEV=i2c2 -DUSE_I2C2
 IMU_B2_2_SRCS    = mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
-IMU_B2_2_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843
-IMU_B2_2_SRCS   += peripherals/hmc5843.c $(SRC_ARCH)/peripherals/hmc5843_arch.c
+IMU_B2_2_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC58XX
+IMU_B2_2_SRCS   += peripherals/hmc58xx.c
 
 test_imu_b2_2.ARCHDIR = $(ARCH)
 test_imu_b2_2.srcs    = test/subsystems/test_imu.c
@@ -498,7 +498,6 @@ test_hmc5843.srcs   += lisa/test/lisa_test_hmc5843.c
 test_hmc5843.CFLAGS += -DUSE_I2C2
 test_hmc5843.srcs   += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
 
-
 #
 # test ITG3200
 #