Skip to content

[STM32F1 F4] Fix #1705 MBED_37 #1707

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 2 commits into from
May 13, 2016
Merged

[STM32F1 F4] Fix #1705 MBED_37 #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7dfcbb
[STM32F1 F4] Fix #1705 MBED_37
adustm May 3, 2016
9a30a1b
[STM32_F1] Fix #1705 MBED_37 by resetting the uart
adustm May 9, 2016
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
8 changes: 8 additions & 0 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F1/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ serial_t stdio_uart;

static void init_uart(serial_t *obj)
{

UartHandle.Instance = (USART_TypeDef *)(obj->uart);

UartHandle.Init.BaudRate = obj->baudrate;
Expand All @@ -67,6 +68,7 @@ static void init_uart(serial_t *obj)
}

HAL_UART_Init(&UartHandle);

}

void serial_init(serial_t *obj, PinName tx, PinName rx)
Expand All @@ -81,14 +83,20 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)

// Enable UART clock
if (obj->uart == UART_1) {
__USART1_FORCE_RESET();
__USART1_RELEASE_RESET();
__HAL_RCC_USART1_CLK_ENABLE();
obj->index = 0;
}
if (obj->uart == UART_2) {
__USART2_FORCE_RESET();
__USART2_RELEASE_RESET();
__HAL_RCC_USART2_CLK_ENABLE();
obj->index = 1;
}
if (obj->uart == UART_3) {
__USART3_FORCE_RESET();
__USART3_RELEASE_RESET();
__HAL_RCC_USART3_CLK_ENABLE();
obj->index = 2;
}
Expand Down
18 changes: 17 additions & 1 deletion libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ serial_t stdio_uart;

static void init_uart(serial_t *obj, UARTName instance)
{

UART_HandleTypeDef *handle = &UartHandle[SERIAL_OBJ(index)];
handle->Instance = (USART_TypeDef *)instance;

Expand Down Expand Up @@ -186,6 +185,7 @@ static void init_uart(serial_t *obj, UARTName instance)
if (HAL_UART_Init(handle) != HAL_OK) {
error("Cannot initialize UART\n");
}

}

void serial_init(serial_t *obj, PinName tx, PinName rx)
Expand All @@ -202,13 +202,17 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
// Enable USART clock
switch (instance) {
case UART_1:
__USART1_FORCE_RESET();
__USART1_RELEASE_RESET();
__HAL_RCC_USART1_CLK_ENABLE();
SERIAL_OBJ(index) = 0;
#if DEVICE_SERIAL_ASYNCH_DMA
__HAL_RCC_DMA2_CLK_ENABLE();
#endif
break;
case UART_2:
__USART2_FORCE_RESET();
__USART2_RELEASE_RESET();
__HAL_RCC_USART2_CLK_ENABLE();
SERIAL_OBJ(index) = 1;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -217,6 +221,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
break;
#if defined(USART3_BASE)
case UART_3:
__USART3_FORCE_RESET();
__USART3_RELEASE_RESET();
__HAL_RCC_USART3_CLK_ENABLE();
SERIAL_OBJ(index) = 2;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -226,6 +232,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
#endif
#if defined(UART4_BASE)
case UART_4:
__USART4_FORCE_RESET();
__USART4_RELEASE_RESET();
__HAL_RCC_UART4_CLK_ENABLE();
SERIAL_OBJ(index) = 3;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -235,6 +243,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
#endif
#if defined(UART5_BASE)
case UART_5:
__USART5_FORCE_RESET();
__USART5_RELEASE_RESET();
__HAL_RCC_UART5_CLK_ENABLE();
SERIAL_OBJ(index) = 4;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -244,6 +254,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
#endif
#if defined(USART6_BASE)
case UART_6:
__USART6_FORCE_RESET();
__USART6_RELEASE_RESET();
__HAL_RCC_USART6_CLK_ENABLE();
SERIAL_OBJ(index) = 5;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -253,6 +265,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
#endif
#if defined(UART7_BASE)
case UART_7:
__USART8_FORCE_RESET();
__USART8_RELEASE_RESET();
__HAL_RCC_UART7_CLK_ENABLE();
SERIAL_OBJ(index) = 6;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand All @@ -262,6 +276,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
#endif
#if defined(UART8_BASE)
case UART_8:
__USART8_FORCE_RESET();
__USART8_RELEASE_RESET();
__HAL_RCC_UART8_CLK_ENABLE();
SERIAL_OBJ(index) = 7;
#if DEVICE_SERIAL_ASYNCH_DMA
Expand Down