1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00

Merge branch 'master' into development

This commit is contained in:
borisbstyle 2016-10-12 10:15:13 +02:00
commit aaafd4f661
9 changed files with 34 additions and 22 deletions

View file

@ -97,8 +97,12 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback,
{
uartPort_t *s = NULL;
if (USARTx == USART1) {
if (false) {
#ifdef USE_UART1
} else if (USARTx == USART1) {
s = serialUART1(baudRate, mode, options);
#endif
#ifdef USE_UART2
} else if (USARTx == USART2) {
s = serialUART2(baudRate, mode, options);