Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: ensure stop bits can be set before UART begin

Browse Source
This commit is contained in:
Andy Piper 2020-10-10 21:22:58 +01:00 committed by Andrew Tridgell
parent bd8619a616
commit 5c32007cdf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_HAL_ChibiOS/UARTDriver.cpp
View File

@ -315,7 +315,9 @@ void UARTDriver::begin(uint32_t b, uint16_t rxS, uint16_t txS)
}
sercfg.irq_cb = rx_irq_cb;
#endif // HAL_UART_NODMA
sercfg.cr2 |= USART_CR2_STOP1_BITS;
if (!(sercfg.cr2 & USART_CR2_STOP2_BITS)) {
sercfg.cr2 |= USART_CR2_STOP1_BITS;
}
sercfg.ctx = (void*)this;
sdStart((SerialDriver*)sdef.serial, &sercfg);
@ -1303,12 +1305,15 @@ void UARTDriver::set_stop_bits(int n)
switch (n) {
case 1:
sercfg.cr2 = _cr2_options | USART_CR2_STOP1_BITS;
_cr2_options &= ~USART_CR2_STOP2_BITS;
_cr2_options |= USART_CR2_STOP1_BITS;
break;
case 2:
sercfg.cr2 = _cr2_options | USART_CR2_STOP2_BITS;
_cr2_options &= ~USART_CR2_STOP1_BITS;
_cr2_options |= USART_CR2_STOP2_BITS;
break;
}
sercfg.cr2 = _cr2_options;
sdStart((SerialDriver*)sdef.serial, &sercfg);
#ifndef HAL_UART_NODMA