diff --git a/conf/airframes/Poine/booz2_a7.xml b/conf/airframes/Poine/booz2_a7.xml index dbe89e64b9..053d19b2fa 100644 --- a/conf/airframes/Poine/booz2_a7.xml +++ b/conf/airframes/Poine/booz2_a7.xml @@ -226,7 +226,7 @@ -include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile +#include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile diff --git a/conf/autopilot/lisa_l_test_progs.makefile b/conf/autopilot/lisa_l_test_progs.makefile index d6ba95cdeb..9d0916de65 100644 --- a/conf/autopilot/lisa_l_test_progs.makefile +++ b/conf/autopilot/lisa_l_test_progs.makefile @@ -209,11 +209,14 @@ test_adc.TARGET = test_adc test_adc.TARGETDIR = test_adc test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) + test_adc.srcs = $(SRC_LISA)/test_adc.c \ $(SRC_ARCH)/stm32_exceptions.c \ $(SRC_ARCH)/stm32_vector_table.c + test_adc.CFLAGS += -DUSE_LED test_adc.srcs += $(SRC_ARCH)/led_hw.c + test_adc.CFLAGS += -DUSE_SYS_TIME test_adc.CFLAGS +=-DSYS_TIME_LED=$(SYS_TIME_LED) test_adc.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)' diff --git a/sw/airborne/lisa/test_adc.c b/sw/airborne/lisa/test_adc.c index 8d73418084..34bcd4dd6b 100644 --- a/sw/airborne/lisa/test_adc.c +++ b/sw/airborne/lisa/test_adc.c @@ -80,7 +80,7 @@ static inline void main_event_task( void ) { uint16_t v1 = 123; uint16_t v2 = 123; v1 = (((adc0_buf.values[0]))); - v2 = (((adc1_buf.values[0]))); + v2 = (((adc3_buf.values[0]))); RunOnceEvery(100, {DOWNLINK_SEND_ADC_GENERIC(DefaultChannel, &v1, &v2)}); } diff --git a/sw/airborne/stm32/adc_hw.c b/sw/airborne/stm32/adc_hw.c index 5bf0698401..c669b27510 100644 --- a/sw/airborne/stm32/adc_hw.c +++ b/sw/airborne/stm32/adc_hw.c @@ -1,7 +1,7 @@ /* - * $Id: adc_hw.c 5313 2010-08-11 18:46:20Z flixr $ + * $Id$ * - * Copyright (C) 2008 Pascal Brisset, Antoine Drouin + * Copyright (C) 2010 The Paparazzi Team * * This file is part of paparazzi. *