Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 02:38:07 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'paparazzi/dev' into transport

Browse Source 
Conflicts:
	sw/airborne/firmwares/fixedwing/ap_downlink.h
	sw/airborne/firmwares/rotorcraft/telemetry.h
This commit is contained in:
Gautier Hattenberger
2012-01-17 22:00:05 +01:00
parent 6381118c06 3d4935ebc5
commit 06bba4f47b
165 changed files with 1458 additions and 5820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/baro_board.xml
+12 -4
View File
@@ -9,11 +9,19 @@
<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
endif
</raw>
</makefile>
</module>