[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5687] headers
From: |
antoine drouin |
Subject: |
[paparazzi-commits] [5687] headers |
Date: |
Thu, 26 Aug 2010 01:23:49 +0000 |
Revision: 5687
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5687
Author: poine
Date: 2010-08-26 01:23:48 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
headers
Modified Paths:
--------------
paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
paparazzi3/trunk/sw/airborne/lisa/test_adc.c
paparazzi3/trunk/sw/airborne/stm32/adc_hw.c
Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml 2010-08-26 00:34:48 UTC
(rev 5686)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml 2010-08-26 01:23:48 UTC
(rev 5687)
@@ -226,7 +226,7 @@
<makefile>
-include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile
+#include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile
</makefile>
Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-08-26
00:34:48 UTC (rev 5686)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-08-26
01:23:48 UTC (rev 5687)
@@ -209,11 +209,14 @@
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.)'
Modified: paparazzi3/trunk/sw/airborne/lisa/test_adc.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_adc.c 2010-08-26 00:34:48 UTC
(rev 5686)
+++ paparazzi3/trunk/sw/airborne/lisa/test_adc.c 2010-08-26 01:23:48 UTC
(rev 5687)
@@ -80,7 +80,7 @@
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)});
}
Modified: paparazzi3/trunk/sw/airborne/stm32/adc_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/stm32/adc_hw.c 2010-08-26 00:34:48 UTC (rev
5686)
+++ paparazzi3/trunk/sw/airborne/stm32/adc_hw.c 2010-08-26 01:23:48 UTC (rev
5687)
@@ -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.
*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [5687] headers,
antoine drouin <=