minor lisa_m makefile cleanup, allow configuration of of GPS_PORT for lisa_m_2.0

This commit is contained in:
Felix Ruess
2012-03-14 17:42:00 +01:00
parent c81c662c19
commit d9ff71059c
2 changed files with 12 additions and 9 deletions
+7 -2
View File
@@ -1,7 +1,8 @@
# Hey Emacs, this is a -*- makefile -*-
# #
# lisa_m_1.0.makefile # lisa_m_1.0.makefile
# #
# http://paparazzi.enac.fr/wiki/User/LisaM # http://paparazzi.enac.fr/wiki/Lisa/M
# #
BOARD=lisa_m BOARD=lisa_m
@@ -51,9 +52,13 @@ ifndef SYS_TIME_LED
SYS_TIME_LED = 1 SYS_TIME_LED = 1
endif endif
ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART3 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART3
endif
ifndef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5 RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
endif
ifndef MODEM_PORT ifndef MODEM_PORT
MODEM_PORT=UART2 MODEM_PORT=UART2
+5 -7
View File
@@ -1,14 +1,12 @@
# Hey Emacs, this is a -*- makefile -*- # Hey Emacs, this is a -*- makefile -*-
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_1.0.makefile
# #
# Swap GPS UART with spektrum UART # Swap GPS UART with spektrum UART
# #
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART1 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART1
GPS_PORT=UART3
# ifndef GPS_PORT
# Disable aligner led for now. GPS_PORT=UART3
# endif
AHRS_ALIGNER_LED = none
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_1.0.makefile