djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/uart: Add uart_set_baudrate function. 

This allows changing the baudrate of the UART without reinitialising it
(reinitialising can lead to spurious characters sent on the TX line).

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-02-03 16:18:35 +11:00
parent 7ed99544e4
commit d2a34c62e7
9 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/stm32/boards/stm32f0xx_hal_conf_base.h
View File

@ -49,6 +49,7 @@
#include "stm32f0xx_hal_wwdg.h"
#include "stm32f0xx_ll_adc.h"
#include "stm32f0xx_ll_rtc.h"
#include "stm32f0xx_ll_usart.h"
// Enable various HAL modules
#define HAL_MODULE_ENABLED

1
ports/stm32/boards/stm32f4xx_hal_conf_base.h
View File

@ -56,6 +56,7 @@
#include "stm32f4xx_ll_adc.h"
#include "stm32f4xx_ll_pwr.h"
#include "stm32f4xx_ll_rtc.h"
#include "stm32f4xx_ll_usart.h"
// Enable various HAL modules
#define HAL_ADC_MODULE_ENABLED

1
ports/stm32/boards/stm32f7xx_hal_conf_base.h
View File

@ -56,6 +56,7 @@
#include "stm32f7xx_ll_adc.h"
#include "stm32f7xx_ll_pwr.h"
#include "stm32f7xx_ll_rtc.h"
#include "stm32f7xx_ll_usart.h"
// Enable various HAL modules
#define HAL_ADC_MODULE_ENABLED

1
ports/stm32/boards/stm32h7xx_hal_conf_base.h
View File

@ -56,6 +56,7 @@
#include "stm32h7xx_ll_adc.h"
#include "stm32h7xx_ll_pwr.h"
#include "stm32h7xx_ll_rtc.h"
#include "stm32h7xx_ll_usart.h"
// Enable various HAL modules
#define HAL_ADC_MODULE_ENABLED

1
ports/stm32/boards/stm32l0xx_hal_conf_base.h
View File

@ -48,6 +48,7 @@
#include "stm32l0xx_hal_wwdg.h"
#include "stm32l0xx_ll_adc.h"
#include "stm32l0xx_ll_rtc.h"
#include "stm32l0xx_ll_usart.h"
// Enable various HAL modules
#define HAL_MODULE_ENABLED

1
ports/stm32/boards/stm32l4xx_hal_conf_base.h
View File

@ -52,6 +52,7 @@
#include "stm32l4xx_hal_wwdg.h"
#include "stm32l4xx_ll_adc.h"
#include "stm32l4xx_ll_rtc.h"
#include "stm32l4xx_ll_usart.h"
// Enable various HAL modules
#define HAL_MODULE_ENABLED

1
ports/stm32/boards/stm32wbxx_hal_conf_base.h
View File

@ -43,6 +43,7 @@
#include "stm32wbxx_hal_usart.h"
#include "stm32wbxx_ll_adc.h"
#include "stm32wbxx_ll_rtc.h"
#include "stm32wbxx_ll_usart.h"
// Enable various HAL modules
#define HAL_MODULE_ENABLED

18
ports/stm32/uart.c
View File

@ -603,7 +603,7 @@ void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
self->attached_to_repl = attached;
}
uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
uint32_t uart_clk = 0;
#if defined(STM32F0)
@ -672,10 +672,20 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
}
#endif
// This formula assumes UART_OVERSAMPLING_16
uint32_t baudrate = uart_clk / self->uartx->BRR;
return uart_clk;
}
return baudrate;
uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
// This formula assumes UART_OVERSAMPLING_16
return uart_get_source_freq(self) / self->uartx->BRR;
}
void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
#if defined(STM32H7) || defined(STM32WB)
LL_USART_PRESCALER_DIV1,
#endif
LL_USART_OVERSAMPLING_16, baudrate);
}
mp_uint_t uart_rx_any(pyb_uart_obj_t *self) {

2
ports/stm32/uart.h
View File

@ -86,6 +86,8 @@ void uart_irq_handler(mp_uint_t uart_id);
void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached);
uint32_t uart_get_baudrate(pyb_uart_obj_t *self);
void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate);
mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout);
int uart_rx_char(pyb_uart_obj_t *uart_obj);