Merge branch 'master' into dev

This commit is contained in:
Felix Ruess
2011-12-07 03:28:59 +01:00
+1 -1
View File
@@ -31,7 +31,7 @@ SYS_TIME_LED = 1
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART3 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT = UART3
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5 RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
#RADIO_CONTROL_LED = 5 RADIO_CONTROL_LED = none
ifndef MODEM_PORT ifndef MODEM_PORT
MODEM_PORT=UART2 MODEM_PORT=UART2