Merge branch 'master' of github.com:paparazzi/paparazzi into stm_i2c

This commit is contained in:
Christophe De Wagter
2012-02-14 11:04:00 +01:00
152 changed files with 1782 additions and 433 deletions
+14 -4
View File
@@ -9,11 +9,21 @@
<periodic fun="baro_downlink_raw()" freq="10." autorun="FALSE"/>
<event fun="BaroEvent(baro_abs,baro_diff)"/>
<makefile target="ap">
<define name="USE_BARO_AS_ALTIMETER"/>
<file name="baro_board.c" dir="boards/$(BOARD)"/>
<define name="ADS1114_I2C_DEVICE" value="i2c1"/>
<define name="USE_ADS1114_1"/>
<file name="ads1114.c" dir="peripherals"/>
<define name="USE_BARO_AS_ALTIMETER"/>
<raw>
ifeq ($(BOARD), navgo)
ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
ap.CFLAGS += -DADS1114_I2C_DEVICE=i2c1
ap.srcs += peripherals/ads1114.c
else ifeq ($(BOARD), umarim)
ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
ap.CFLAGS += -DADS1114_I2C_DEVICE=i2c1
ap.srcs += peripherals/ads1114.c
else ifeq ($(BOARD), lisa_l)
ap.CFLAGS += -DUSE_I2C2
endif
</raw>
</makefile>
</module>