Merge branch 'dev' into dev_i2c

conf/boards/lisa_l_1.0.makefile

@@ -59,8 +59,16 @@ ifndef SYS_TIME_LED
 SYS_TIME_LED = 1
 endif
 
+
+#
+# default uart configuration
+#
+ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART3
+endif
+ifndef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
 RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
+endif
 
 ifndef MODEM_PORT
 MODEM_PORT=UART2

conf/boards/lisa_l_1.1.makefile

@@ -1,11 +1,115 @@
 # Hey Emacs, this is a -*- makefile -*-
+#
+# lisa_l_1.1.makefile
+#
+# http://paparazzi.enac.fr/wiki/User/LisaL
+#
+
+
+# we are actually still using the Lisa/L 1.0 header file
+
+BOARD=lisa_l
+BOARD_VERSION=1.0
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# -----------------------------------------------------------------------
+ifeq ($(BOARD_PROCESSOR),'omap')
+
+	ARCH  = omap
+	$(TARGET).LDFLAGS += -levent -lm
+
+# -----------------------------------------------------------------------
+else
+
+	ARCH=stm32
+
+	$(TARGET).ARCHDIR = $(ARCH)
+# not needed?
+
+endif
+# -----------------------------------------------------------------------
+
+ifndef FLASH_MODE
+FLASH_MODE = JTAG
+endif
+
+#
+#
+# some default values shared between different firmwares
+#
+#
+
+#
+# default LED configuration
+#
+ifndef RADIO_CONTROL_LED
+RADIO_CONTROL_LED  = 5
+endif
+
+ifndef BARO_LED
+BARO_LED = none
+endif
 
-include $(PAPARAZZI_SRC)/conf/boards/lisa_l_1.0.makefile
+ifndef AHRS_ALIGNER_LED
+AHRS_ALIGNER_LED = 7
+endif
+
+ifndef GPS_LED
+GPS_LED = 3
+endif
+
+ifndef SYS_TIME_LED
+SYS_TIME_LED = 1
+endif
+
+
+#
+# default uart configuration
+#
+ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
+RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART3
+endif
+ifndef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
+RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
+endif
+
+ifndef MODEM_PORT
+MODEM_PORT=UART2
+endif
+ifndef MODEM_BAUD
+MODEM_BAUD=B57600
+endif
+
+ifndef GPS_PORT
+GPS_PORT=UART1
+endif
+ifndef GPS_BAUD
+GPS_BAUD=B38400
+endif
 
 #
 # this is the DRDY pin of a max1168 on a booz IMU
 #
-# v1.1
+# v 1.1
 #
 MAX_1168_DRDY_PORT = _GPIOB
 MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOB
+# v1.1
+#MAX_1168_DRDY_PORT = GPIOB
+
+
+ifndef ADC_IR1
+ADC_IR1      = 1
+ADC_IR1_CHAN = 0
+endif
+ifndef ADC_IR2
+ADC_IR2      = 2
+ADC_IR2_CHAN = 1
+endif
+ifndef ADC_IR3
+ADC_IR_TOP      = 4
+ADC_IR_TOP_CHAN = 3
+endif
+ifndef ADC_IR_NB_SAMPLES
+ADC_IR_NB_SAMPLES = 16
+endif

conf/boards/lisa_m_1.0.makefile

@@ -52,6 +52,9 @@ ifndef SYS_TIME_LED
 SYS_TIME_LED = 1
 endif
 
+#
+# default uart configuration
+#
 ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART3
 endif
@@ -76,17 +79,6 @@ GPS_BAUD=B38400
 endif
 
 
-#
-# this is the DRDY pin of a max1168 on a booz IMU
-#
-# v 1.0
-#
-MAX_1168_DRDY_PORT = _GPIOD
-MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOD
-# v1.1
-#MAX_1168_DRDY_PORT = GPIOB
-
-
 
 ifndef ADC_IR1
 ADC_IR1      = 1

conf/boards/lisa_m_2.0.makefile

@@ -1,12 +1,97 @@
 # Hey Emacs, this is a -*- makefile -*-
+#
+# lisa_m_2.0.makefile
+#
+# http://paparazzi.enac.fr/wiki/Lisa/M
+#
+
+BOARD=lisa_m
+BOARD_VERSION=1.0
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+ARCH=stm32
+$(TARGET).ARCHDIR = $(ARCH)
+# not needed?
+$(TARGET).OOCD_INTERFACE=flossjtag
+#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
+
+# -----------------------------------------------------------------------
+
+ifndef FLASH_MODE
+FLASH_MODE = JTAG
+#FLASH_MODE = SERIAL
+endif
+
+#
+#
+# some default values shared between different firmwares
+#
+#
+
+
+#
+# default LED configuration
+#
+ifndef RADIO_CONTROL_LED
+RADIO_CONTROL_LED  = none
+endif
+
+ifndef BARO_LED
+BARO_LED = none
+endif
+
+ifndef AHRS_ALIGNER_LED
+AHRS_ALIGNER_LED = none
+endif
+
+ifndef GPS_LED
+GPS_LED = none
+endif
+
+ifndef SYS_TIME_LED
+SYS_TIME_LED = 1
+endif
 
 #
-# Swap GPS UART with spektrum UART
+# default uart configuration
 #
+ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART1
+endif
+
+ifndef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
+RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
+endif
+
+ifndef MODEM_PORT
+MODEM_PORT=UART2
+endif
+ifndef MODEM_BAUD
+MODEM_BAUD=B57600
+endif
+
 
 ifndef GPS_PORT
 GPS_PORT=UART3
 endif
+ifndef GPS_BAUD
+GPS_BAUD=B38400
+endif
+
 
-include $(PAPARAZZI_SRC)/conf/boards/lisa_m_1.0.makefile
+
+ifndef ADC_IR1
+ADC_IR1      = 1
+ADC_IR1_CHAN = 0
+endif
+ifndef ADC_IR2
+ADC_IR2      = 2
+ADC_IR2_CHAN = 1
+endif
+ifndef ADC_IR3
+ADC_IR_TOP      = 4
+ADC_IR_TOP_CHAN = 3
+endif
+ifndef ADC_IR_NB_SAMPLES
+ADC_IR_NB_SAMPLES = 16
+endif

conf/boards/navgo_1.0.makefile

@@ -44,7 +44,9 @@ SYS_TIME_LED = none
 endif
 
 
-### default settings
+#
+# default uart settings
+#
 ifndef GPS_PORT
 GPS_PORT	= UART0
 endif

conf/boards/tiny_0.99.makefile

@@ -4,17 +4,81 @@
 # http://paparazzi.enac.fr/wiki/Tiny_v0.99
 #
 
-
-include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
-
+ARCH=lpc21
 
 BOARD=tiny
 BOARD_VERSION=0.99
 
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-GPS_PORT = UART1
+
+ifndef FLASH_MODE
+FLASH_MODE = IAP
+endif
+
+
+LPC21ISP_BAUD = 38400
+LPC21ISP_XTAL = 12000
+
+#
+# default LED configuration
+#
+ifndef RADIO_CONTROL_LED
+RADIO_CONTROL_LED  = none
+endif
+
+ifndef BARO_LED
+BARO_LED = none
+endif
+
+ifndef AHRS_ALIGNER_LED
+AHRS_ALIGNER_LED = none
+endif
+
+ifndef GPS_LED
 GPS_LED = none
-MODEM_PORT = UART0
+endif
+
+ifndef SYS_TIME_LED
+SYS_TIME_LED = none
+endif
+
 
+#
+# default uart settings
+#
+ifndef GPS_PORT
+GPS_PORT	= UART1
+endif
+ifndef GPS_BAUD
+GPS_BAUD	= B38400
+endif
+
+ifndef MODEM_PORT
+MODEM_PORT	= UART0
+endif
+ifndef MODEM_BAUD
+MODEM_BAUD 	= B57600
+endif
+
+
+
+ADC_IR_TOP = ADC_0
+ADC_IR1 = ADC_1
+ADC_IR2 = ADC_2
+ADC_IR_NB_SAMPLES = 16
+ADC_GYRO_NB_SAMPLES = 16
+
+ADC_GENERIC_NB_SAMPLES = 16
+
+#
+# you can use different actuators by adding a configure option to your firmware section
+# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
+#
+ifndef ACTUATORS
 ACTUATORS = actuators_4015
+endif
+
+
+# All targets on the TINY board run on the same processor achitecture
+$(TARGET).ARCHDIR = $(ARCH)