From db5fc2b0a04222de6dcd6b15bd00d749e9b23d96 Mon Sep 17 00:00:00 2001
From: Antoine Drouin <poinix@gmail.com>
Date: Thu, 17 Jun 2010 11:09:00 +0000
Subject: [PATCH]

---
 conf/airframes/Poine/beth.xml           |  6 ++--
 conf/airframes/Poine/booz2_a6.xml       |  1 +
 conf/autopilot/lisa_test_progs.makefile | 45 ++++++++++++++-----------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/conf/airframes/Poine/beth.xml b/conf/airframes/Poine/beth.xml
index a9e0b85c79..7218b717e0 100644
--- a/conf/airframes/Poine/beth.xml
+++ b/conf/airframes/Poine/beth.xml
@@ -164,8 +164,10 @@ main_overo.srcs  = $(SRC_BETH)/main_overo.c
 main_overo.srcs += $(SRC_FMS)/fms_spi_link.c
 
 
-
-
+#
+#
+#
+include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile
 
   </makefile>
 
diff --git a/conf/airframes/Poine/booz2_a6.xml b/conf/airframes/Poine/booz2_a6.xml
index c8b5e93d2e..3add9e92d9 100644
--- a/conf/airframes/Poine/booz2_a6.xml
+++ b/conf/airframes/Poine/booz2_a6.xml
@@ -1,3 +1,4 @@
+<!-- this is a custom hexa Lisa/L#3 and mikrokopter controllers -->
 <airframe name="booz2_a6">
 
   <servos min="0" neutral="0" max="0xff">
diff --git a/conf/autopilot/lisa_test_progs.makefile b/conf/autopilot/lisa_test_progs.makefile
index d2f2af8782..8a022e2bb1 100644
--- a/conf/autopilot/lisa_test_progs.makefile
+++ b/conf/autopilot/lisa_test_progs.makefile
@@ -34,11 +34,11 @@
 overo_test_spi.ARCHDIR = omap
 overo_test_spi.srcs=$(SRC_FMS)/overo_test_spi.c
 
-
-overo_test_link_stm.ARCHDIR = omap
-overo_test_link_stm.CFLAGS  += -I$(ACINCLUDE) -I. -I$(PAPARAZZI_HOME)/var/include
-overo_test_link_stm.srcs  = $(SRC_FMS)/overo_test_link.c
-overo_test_link_stm.srcs += $(SRC_FMS)/fms_spi_link.c
+# test spi link between overo and stm32
+overo_test_spi_link.ARCHDIR = omap
+overo_test_spi_link.CFLAGS  += -I$(ACINCLUDE) -I. -I$(PAPARAZZI_HOME)/var/include
+overo_test_spi_link.srcs  = $(SRC_FMS)/overo_test_spi_link.c
+overo_test_spi_link.srcs += $(SRC_FMS)/fms_spi_link.c
 
 
 overo_test_telemetry.ARCHDIR  = omap
@@ -730,25 +730,30 @@ test_spi_slave2.srcs += downlink.c pprz_transport.c
 
 
 #
-# test overo com
+# test spi link between overo and stm32
 #
-test_ovc.ARCHDIR = $(ARCHI)
-test_ovc.TARGET = test_ovc
-test_ovc.TARGETDIR = test_ovc
-test_ovc.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
-test_ovc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
-test_ovc.srcs += $(SRC_LISA)/test_ovc.c       \
-                 $(SRC_LISA)/exceptions.c     \
-                 $(SRC_LISA)/vector_table.c
-test_ovc.CFLAGS += -DUSE_LED
-test_ovc.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1
-test_ovc.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
-test_ovc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+stm_test_spi_link.ARCHDIR = $(ARCHI)
+stm_test_spi_link.TARGET = stm_test_spi_link
+stm_test_spi_link.TARGETDIR = stm_test_spi_link
+stm_test_spi_link.CFLAGS += -Ilisa -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
+stm_test_spi_link.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
+stm_test_spi_link.srcs += lisa/stm_test_spi_link.c       \
+	                  $(SRC_ARCH)/stm32_exceptions.c   \
+		          $(SRC_ARCH)/stm32_vector_table.c
 
-test_ovc.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
-test_ovc.srcs += $(SRC_ARCH)/uart_hw.c
+stm_test_spi_link.CFLAGS += -DUSE_LED
+stm_test_spi_link.srcs += $(SRC_ARCH)/led_hw.c
 
+stm_test_spi_link.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1
+stm_test_spi_link.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
+stm_test_spi_link.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 
+stm_test_spi_link.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
+stm_test_spi_link.srcs += $(SRC_ARCH)/uart_hw.c
+
+stm_test_spi_link.CFLAGS += -DUSE_OVERO_LINK -DOVERO_LINK_MSG_UNION=AutopilotMessageFoo1
+stm_test_spi_link.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=4 -DUSE_DMA1_C2_IRQ
+stm_test_spi_link.srcs += lisa/lisa_overo_link.c lisa/arch/stm32/lisa_overo_link_arch.c