fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stm32/uart: Add UART RX/CTS pin pull config options.

Browse Source 
The UART driver enables a pull-up on RX/CTS pins by default.  This can
cause UART to fail to receive in certain situations, eg with RS485
transceivers.

This commit adds compile-time configuration options to set the pull mode on
the RX and CTS pins of each UART.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
This commit is contained in:
iabdalkader 2024-09-19 09:37:50 +02:00 committed by Damien George
parent 3e085c3aa6
commit eec5eb4260
1 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ports/stm32/uart.c
View File

@ -252,6 +252,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
const machine_pin_obj_t *pins[4] = {0}; const machine_pin_obj_t *pins[4] = {0};
// Default pull is pull-up on RX and CTS (the input pins).
uint32_t pins_pull[4] = { GPIO_NOPULL, GPIO_PULLUP, GPIO_NOPULL, GPIO_PULLUP };
switch (uart_obj->uart_id) { switch (uart_obj->uart_id) {
#if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX) #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
case PYB_UART_1: case PYB_UART_1:
@ -270,6 +273,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART1_CTS; pins[3] = MICROPY_HW_UART1_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART1_RX_PULL)
pins_pull[1] = MICROPY_HW_UART1_RX_PULL;
#endif
#if defined(MICROPY_HW_UART1_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART1_CTS_PULL;
#endif
__HAL_RCC_USART1_CLK_ENABLE(); __HAL_RCC_USART1_CLK_ENABLE();
break; break;
#endif #endif
@ -295,6 +304,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART2_CTS; pins[3] = MICROPY_HW_UART2_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART2_RX_PULL)
pins_pull[1] = MICROPY_HW_UART2_RX_PULL;
#endif
#if defined(MICROPY_HW_UART2_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART2_CTS_PULL;
#endif
__HAL_RCC_USART2_CLK_ENABLE(); __HAL_RCC_USART2_CLK_ENABLE();
break; break;
#endif #endif
@ -322,6 +337,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART3_CTS; pins[3] = MICROPY_HW_UART3_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART3_RX_PULL)
pins_pull[1] = MICROPY_HW_UART3_RX_PULL;
#endif
#if defined(MICROPY_HW_UART3_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART3_CTS_PULL;
#endif
__HAL_RCC_USART3_CLK_ENABLE(); __HAL_RCC_USART3_CLK_ENABLE();
break; break;
#endif #endif
@ -358,6 +379,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART4_CTS; pins[3] = MICROPY_HW_UART4_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART4_RX_PULL)
pins_pull[1] = MICROPY_HW_UART4_RX_PULL;
#endif
#if defined(MICROPY_HW_UART4_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART4_CTS_PULL;
#endif
break; break;
#endif #endif
@ -393,6 +420,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART5_CTS; pins[3] = MICROPY_HW_UART5_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART5_RX_PULL)
pins_pull[1] = MICROPY_HW_UART5_RX_PULL;
#endif
#if defined(MICROPY_HW_UART5_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART5_CTS_PULL;
#endif
break; break;
#endif #endif
@ -419,6 +452,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART6_CTS; pins[3] = MICROPY_HW_UART6_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART6_RX_PULL)
pins_pull[1] = MICROPY_HW_UART6_RX_PULL;
#endif
#if defined(MICROPY_HW_UART6_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART6_CTS_PULL;
#endif
__HAL_RCC_USART6_CLK_ENABLE(); __HAL_RCC_USART6_CLK_ENABLE();
break; break;
#endif #endif
@ -447,6 +486,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART7_CTS; pins[3] = MICROPY_HW_UART7_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART7_RX_PULL)
pins_pull[1] = MICROPY_HW_UART7_RX_PULL;
#endif
#if defined(MICROPY_HW_UART7_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART7_CTS_PULL;
#endif
break; break;
#endif #endif
@ -474,6 +519,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART8_CTS; pins[3] = MICROPY_HW_UART8_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_UART8_RX_PULL)
pins_pull[1] = MICROPY_HW_UART8_RX_PULL;
#endif
#if defined(MICROPY_HW_UART8_CTS_PULL)
pins_pull[3] = MICROPY_HW_UART8_CTS_PULL;
#endif
break; break;
#endif #endif
@ -485,6 +536,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
__HAL_RCC_UART9_CLK_ENABLE(); __HAL_RCC_UART9_CLK_ENABLE();
pins[0] = MICROPY_HW_UART9_TX; pins[0] = MICROPY_HW_UART9_TX;
pins[1] = MICROPY_HW_UART9_RX; pins[1] = MICROPY_HW_UART9_RX;
#if defined(MICROPY_HW_UART9_RX_PULL)
pins_pull[1] = MICROPY_HW_UART9_RX_PULL;
#endif
break; break;
#endif #endif
@ -502,6 +556,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
#endif #endif
pins[0] = MICROPY_HW_UART10_TX; pins[0] = MICROPY_HW_UART10_TX;
pins[1] = MICROPY_HW_UART10_RX; pins[1] = MICROPY_HW_UART10_RX;
#if defined(MICROPY_HW_UART10_RX_PULL)
pins_pull[1] = MICROPY_HW_UART10_RX_PULL;
#endif
break; break;
#endif #endif
@ -527,6 +584,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_LPUART1_CTS; pins[3] = MICROPY_HW_LPUART1_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_LPUART1_RX_PULL)
pins_pull[1] = MICROPY_HW_LPUART1_RX_PULL;
#endif
#if defined(MICROPY_HW_LPUART1_CTS_PULL)
pins_pull[3] = MICROPY_HW_LPUART1_CTS_PULL;
#endif
__HAL_RCC_LPUART1_CLK_ENABLE(); __HAL_RCC_LPUART1_CLK_ENABLE();
break; break;
#endif #endif
@ -551,6 +614,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_LPUART2_CTS; pins[3] = MICROPY_HW_LPUART2_CTS;
} }
#endif #endif
#if defined(MICROPY_HW_LPUART2_RX_PULL)
pins_pull[1] = MICROPY_HW_LPUART2_RX_PULL;
#endif
#if defined(MICROPY_HW_LPUART2_CTS_PULL)
pins_pull[3] = MICROPY_HW_LPUART2_CTS_PULL;
#endif
__HAL_RCC_LPUART2_CLK_ENABLE(); __HAL_RCC_LPUART2_CLK_ENABLE();
break; break;
#endif #endif
@ -564,10 +633,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
for (uint i = 0; i < 4; i++) { for (uint i = 0; i < 4; i++) {
if (pins[i] != NULL) { if (pins[i] != NULL) {
// Configure pull-up on RX and CTS (the input pins). if (!mp_hal_pin_config_alt(pins[i], mode, pins_pull[i], uart_fn, uart_unit)) {
uint32_t pull = (i & 1) ? MP_HAL_PIN_PULL_UP : MP_HAL_PIN_PULL_NONE;
bool ret = mp_hal_pin_config_alt(pins[i], mode, pull, uart_fn, uart_unit);
if (!ret) {
return false; return false;
} }
} }