diff options
| author | Bernard Xiong <[email protected]> | 2018-05-24 11:09:24 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-24 11:09:24 +0800 |
| commit | b0a91ad13618e39a3bbeff8955057954e92c348d (patch) | |
| tree | 83fa9b3da1c5d264f4fd132b32acfaf8a6a506be | |
| parent | da6f9e2dc0222839ba5fa06463d5c03490f2eeab (diff) | |
| parent | 21ea37731899e11668f7cd9a82321dd6f3ccf5d7 (diff) | |
Merge pull request #1466 from qgyhd1234/407uart
[bsp]：修改控制台打印串口由rt_config.h控制
| -rw-r--r-- | bsp/stm32f40x/drivers/board.c | 2 | ||||
| -rw-r--r-- | bsp/stm32f40x/drivers/board.h | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/bsp/stm32f40x/drivers/board.c b/bsp/stm32f40x/drivers/board.c index a63682d779..fe6742b70a 100644 --- a/bsp/stm32f40x/drivers/board.c +++ b/bsp/stm32f40x/drivers/board.c @@ -96,7 +96,7 @@ void rt_hw_board_init() rt_components_board_init(); #ifdef RT_USING_CONSOLE - rt_console_set_device(CONSOLE_DEVICE); + rt_console_set_device(RT_CONSOLE_DEVICE_NAME); #endif } diff --git a/bsp/stm32f40x/drivers/board.h b/bsp/stm32f40x/drivers/board.h index 7f362503b0..4ca3cf41c6 100644 --- a/bsp/stm32f40x/drivers/board.h +++ b/bsp/stm32f40x/drivers/board.h @@ -46,24 +46,8 @@ extern char __ICFEDIT_region_RAM_end__; #define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024) #endif -// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3 -// <i>Default: 1 -#define STM32_CONSOLE_USART 2 - void rt_hw_board_init(void); -#if STM32_CONSOLE_USART == 0 -#define CONSOLE_DEVICE "no" -#elif STM32_CONSOLE_USART == 1 -#define CONSOLE_DEVICE "uart1" -#elif STM32_CONSOLE_USART == 2 -#define CONSOLE_DEVICE "uart2" -#elif STM32_CONSOLE_USART == 3 -#define CONSOLE_DEVICE "uart3" -#endif - -#define FINSH_DEVICE_NAME CONSOLE_DEVICE - #endif // <<< Use Configuration Wizard in Context Menu >>> |