Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ports/stm32/uart: Add an option to disable UART RX pull-up. #15798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2024
Merged

ports/stm32/uart: Add an option to disable UART RX pull-up. #15798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 70 additions & 4 deletions ports/stm32/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,

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) {
#if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
case PYB_UART_1:
Expand All @@ -270,6 +273,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART1_CTS;
}
#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();
break;
#endif
Expand All @@ -295,6 +304,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART2_CTS;
}
#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();
break;
#endif
Expand Down Expand Up @@ -322,6 +337,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART3_CTS;
}
#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();
break;
#endif
Expand Down Expand Up @@ -358,6 +379,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART4_CTS;
}
#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;
#endif

Expand Down Expand Up @@ -393,6 +420,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART5_CTS;
}
#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;
#endif

Expand All @@ -419,6 +452,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART6_CTS;
}
#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();
break;
#endif
Expand Down Expand Up @@ -447,6 +486,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART7_CTS;
}
#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;
#endif

Expand Down Expand Up @@ -474,6 +519,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_UART8_CTS;
}
#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;
#endif

Expand All @@ -485,6 +536,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
__HAL_RCC_UART9_CLK_ENABLE();
pins[0] = MICROPY_HW_UART9_TX;
pins[1] = MICROPY_HW_UART9_RX;
#if defined(MICROPY_HW_UART9_RX_PULL)
pins_pull[1] = MICROPY_HW_UART9_RX_PULL;
#endif
break;
#endif

Expand All @@ -502,6 +556,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
#endif
pins[0] = MICROPY_HW_UART10_TX;
pins[1] = MICROPY_HW_UART10_RX;
#if defined(MICROPY_HW_UART10_RX_PULL)
pins_pull[1] = MICROPY_HW_UART10_RX_PULL;
#endif
break;
#endif

Expand All @@ -527,6 +584,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_LPUART1_CTS;
}
#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();
break;
#endif
Expand All @@ -551,6 +614,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
pins[3] = MICROPY_HW_LPUART2_CTS;
}
#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();
break;
#endif
Expand All @@ -564,10 +633,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,

for (uint i = 0; i < 4; i++) {
if (pins[i] != NULL) {
// Configure pull-up on RX and CTS (the input pins).
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) {
if (!mp_hal_pin_config_alt(pins[i], mode, pins_pull[i], uart_fn, uart_unit)) {
return false;
}
}
Expand Down
Loading