Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[fix] remove unused i2c dev from aspirin_2 and lisa_s conf

Browse Source 
this was produce a strange side effect on bluegiga module (#1835)
This commit is contained in:
Gautier Hattenberger
2016-09-20 17:21:05 +02:00
parent 7ce244e7ca
commit 604a0df701
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/imu_aspirin_v2_common.xml
-4
View File
@@ -7,7 +7,6 @@
- Accelerometer/Gyroscope: MPU6000 via SPI
- Magnetometer: HMC5883 as I2C slave of MPU
</description>
<configure name="ASPIRIN_2_I2C_DEV" value="i2c2" description="I2C device to use"/>
<configure name="ASPIRIN_2_SPI_DEV" value="spi2" description="SPI device to use for accel"/>
<configure name="ASPIRIN_2_SPI_SLAVE_IDX" value="SPI_SLAVE2" description="slave index of the accel CS pin"/>
<define name="ASPIRIN_2_DISABLE_MAG" value="FALSE" description="set to TRUE to disable the mag on Aspirin"/>
@@ -31,12 +30,9 @@
<event fun="imu_aspirin2_event()"/>
<makefile target="!sim|nps|fbw">
<!-- default for stm32, do we want to provide i2c0,spi1,SPI_SLAVE0 defaults for lpc again?-->
<configure name="ASPIRIN_2_I2C_DEV" default="i2c2" case="lower|upper"/>
<configure name="ASPIRIN_2_SPI_DEV" default="spi2" case="lower|upper"/>
<configure name="ASPIRIN_2_SPI_SLAVE_IDX" default="SPI_SLAVE2"/>
<define name="ASPIRIN_2_I2C_DEV" value="$(ASPIRIN_2_I2C_DEV_LOWER)"/>
<define name="USE_$(ASPIRIN_2_I2C_DEV_UPPER)"/>
<define name="ASPIRIN_2_SPI_DEV" value="$(ASPIRIN_2_SPI_DEV_LOWER)"/>
<define name="USE_$(ASPIRIN_2_SPI_DEV_UPPER)"/>
<define name="ASPIRIN_2_SPI_SLAVE_IDX" value="$(ASPIRIN_2_SPI_SLAVE_IDX)"/>
conf/modules/imu_lisa_s_v1.0.xml
+1 -2
View File
@@ -18,8 +18,7 @@
</doc>
<autoload name="imu_aspirin_v2_common"/>
<makefile target="!sim|nps|fbw">
<configure name="ASPIRIN_2_I2C_DEV" value="i2c2"/>
<configure name="ASPIRIN_2_SPI_DEV" value="spi1"/>
<configure name="ASPIRIN_2_SPI_DEV" value="spi1" case="lower|upper"/>
<configure name="ASPIRIN_2_SPI_SLAVE_IDX" value="SPI_SLAVE0"/>
<!-- SLAVE0 is on PA4 (NSS) (MPU600 CS) -->
<define name="USE_SPI_SLAVE0"/>