Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Fix arm/disarm/arm bug when using shared msp/telemetry ports.

Browse source 
All msp ports are now re-initialised when disarming.

Bug wa introduced by c06fd78b83 - see
#144.

Runtime serial port scenario should not have been erased.

Fixes #144 and #155. Cleanup #125.
This commit is contained in:
Dominic Clifton 2014-11-05 19:39:13 +00:00
parent 2d7184b25b
commit db36cfe12e
6 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/serial_uart.c
View file

@ -41,6 +41,7 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode);
static void uartReconfigure(uartPort_t *uartPort)
{
USART_InitTypeDef USART_InitStructure;
USART_Cmd(uartPort->USARTx, DISABLE);
USART_InitStructure.USART_BaudRate = uartPort->port.baudRate;
USART_InitStructure.USART_WordLength = USART_WordLength_8b;
@ -59,6 +60,7 @@ static void uartReconfigure(uartPort_t *uartPort)
USART_InitStructure.USART_Mode |= USART_Mode_Tx;
USART_Init(uartPort->USARTx, &USART_InitStructure);
USART_Cmd(uartPort->USARTx, ENABLE);
}
serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, serialInversion_e inversion)
@ -170,7 +172,6 @@ void uartSetBaudRate(serialPort_t *instance, uint32_t baudRate)
uartPort_t *uartPort = (uartPort_t *)instance;
uartPort->port.baudRate = baudRate;
uartReconfigure(uartPort);
USART_Cmd(uartPort->USARTx, ENABLE);
}
void uartSetMode(serialPort_t *instance, portMode_t mode)
@ -178,7 +179,6 @@ void uartSetMode(serialPort_t *instance, portMode_t mode)
uartPort_t *uartPort = (uartPort_t *)instance;
uartPort->port.mode = mode;
uartReconfigure(uartPort);
USART_Cmd(uartPort->USARTx, ENABLE);
}
void uartStartTxDMA(uartPort_t *s)