From 95ae1375fc02e732a5369c0566f45d62a3587c08 Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Tue, 19 Feb 2013 21:53:30 +0100
Subject: [PATCH] [tests] fix test_baro for lisa

---
 conf/firmwares/lisa_test_progs.makefile       | 34 +++++++++++++++----
 .../lisa/{test_baro.c => test_baro_i2c.c}     |  0
 2 files changed, 28 insertions(+), 6 deletions(-)
 rename sw/airborne/lisa/{test_baro.c => test_baro_i2c.c} (100%)

diff --git a/conf/firmwares/lisa_test_progs.makefile b/conf/firmwares/lisa_test_progs.makefile
index 98de9d6746..3bec5740db 100644
--- a/conf/firmwares/lisa_test_progs.makefile
+++ b/conf/firmwares/lisa_test_progs.makefile
@@ -178,14 +178,36 @@ test_baro.CFLAGS += $(COMMON_TELEMETRY_CFLAGS)
 test_baro.srcs   += $(COMMON_TELEMETRY_SRCS)
 
 test_baro.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOARD)
-test_baro.srcs   += $(SRC_LISA)/test_baro.c
+
 ifeq ($(BOARD), lisa_l)
-test_baro.srcs   += $(SRC_BOARD)/baro_board.c
-else
-test_baro.srcs   += $(SRC_BOARD)/baro_board_i2c.c
-endif
 test_baro.CFLAGS += -DUSE_I2C2
-test_baro.srcs   += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
+test_baro.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
+test_baro.srcs += $(SRC_BOARD)/baro_board.c
+test_baro.srcs += $(SRC_LISA)/test_baro_i2c.c
+
+# Lisa/M baro
+else ifeq ($(BOARD), lisa_m)
+# defaults to i2c baro bmp085 on the board
+LISA_M_BARO ?= BARO_BOARD_BMP085
+  ifeq ($(LISA_M_BARO), BARO_MS5611_SPI)
+    include $(CFG_SHARED)/spi_master.makefile
+    test_baro.CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3
+    test_baro.srcs += $(SRC_BOARD)/baro_ms5611_spi.c
+    test_baro.srcs += $(SRC_LISA)/test_baro_spi.c
+  else ifeq ($(LISA_M_BARO), BARO_MS5611_I2C)
+    test_baro.CFLAGS += -DUSE_I2C2
+    test_baro.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
+    test_baro.srcs += $(SRC_BOARD)/baro_ms5611_i2c.c
+    test_baro.srcs += $(SRC_LISA)/test_baro_i2c.c
+  else ifeq ($(LISA_M_BARO), BARO_BOARD_BMP085)
+	test_baro.CFLAGS += -DUSE_I2C2
+    test_baro.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
+    test_baro.srcs += $(SRC_BOARD)/baro_board.c
+    test_baro.srcs += $(SRC_LISA)/test_baro_i2c.c
+  endif
+  test_baro.CFLAGS += -D$(LISA_M_BARO)
+endif
+
 
 
 #
diff --git a/sw/airborne/lisa/test_baro.c b/sw/airborne/lisa/test_baro_i2c.c
similarity index 100%
rename from sw/airborne/lisa/test_baro.c
rename to sw/airborne/lisa/test_baro_i2c.c