alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_uart_vfs_test_error' into 'master'

Browse Source 
bugfix(uart): Don't disable console uart peripheral

See merge request !1456
This commit is contained in:
Angus Gratton 2017-10-27 19:20:13 +08:00
commit 7c9b24b407
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/driver/uart.c
View File

@ -1140,12 +1140,14 @@ esp_err_t uart_driver_delete(uart_port_t uart_num)
free(p_uart_obj[uart_num]); free(p_uart_obj[uart_num]);
p_uart_obj[uart_num] = NULL; p_uart_obj[uart_num] = NULL;
if(uart_num == UART_NUM_0) { if (uart_num != CONFIG_CONSOLE_UART_NUM ) {
periph_module_disable(PERIPH_UART0_MODULE); if(uart_num == UART_NUM_0) {
} else if(uart_num == UART_NUM_1) { periph_module_disable(PERIPH_UART0_MODULE);
periph_module_disable(PERIPH_UART1_MODULE); } else if(uart_num == UART_NUM_1) {
} else if(uart_num == UART_NUM_2) { periph_module_disable(PERIPH_UART1_MODULE);
periph_module_disable(PERIPH_UART2_MODULE); } else if(uart_num == UART_NUM_2) {
periph_module_disable(PERIPH_UART2_MODULE);
}
} }
return ESP_OK; return ESP_OK;
} }