[paparazzi-commits] [6332] fixedwing on lisa

[antoine drouin]

Revision: 6332
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6332
Author:   poine
Date:     2010-11-04 15:40:32 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
fixedwing on lisa

Modified Paths:
--------------
    paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
    paparazzi3/trunk/conf/boards/lisa_m_1.0.makefile

Modified: paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-11-04 15:39:51 UTC 
(rev 6331)
+++ paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-11-04 15:40:32 UTC 
(rev 6332)
@@ -59,3 +59,28 @@
 MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOD
 # v1.1 
 #MAX_1168_DRDY_PORT = GPIOB
+
+
+#
+# definitions below were added to get fixedwing firmware to build
+#
+# modem is usualy connected there
+ifndef MODEM_UART_NR
+MODEM_UART_NR = 2
+endif
+
+ifndef ADC_IR1
+ADC_IR1    = 1
+endif
+ifndef ADC_IR2
+ADC_IR2    = 2
+endif
+ifndef ADC_IR3
+ADC_IR_TOP = 3
+endif
+ifndef ADC_IR_NB_SAMPLES
+ADC_IR_NB_SAMPLES = 16
+endif
+ifndef GPS_UART_NR
+GPS_UART_NR    = 1
+endif

Modified: paparazzi3/trunk/conf/boards/lisa_m_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_m_1.0.makefile    2010-11-04 15:39:51 UTC 
(rev 6331)
+++ paparazzi3/trunk/conf/boards/lisa_m_1.0.makefile    2010-11-04 15:40:32 UTC 
(rev 6332)
@@ -42,7 +42,7 @@
 
 GPS_PORT=UART1
 GPS_BAUD=B38400
-#GPS_LED = 3
+GPS_LED = none
 
 #
 # this is the DRDY pin of a max1168 on a booz IMU
@@ -53,3 +53,28 @@
 MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOD
 # v1.1 
 #MAX_1168_DRDY_PORT = GPIOB
+
+
+#
+# definitions below were added to get fixedwing firmware to build
+#
+# modem is usualy connected there
+ifndef MODEM_UART_NR
+MODEM_UART_NR = 2
+endif
+
+ifndef ADC_IR1
+ADC_IR1    = 1
+endif
+ifndef ADC_IR2
+ADC_IR2    = 2
+endif
+ifndef ADC_IR3
+ADC_IR_TOP = 3
+endif
+ifndef ADC_IR_NB_SAMPLES
+ADC_IR_NB_SAMPLES = 16
+endif
+ifndef GPS_UART_NR
+GPS_UART_NR    = 1
+endif