diff options
| author | shuobatian <[email protected]> | 2021-04-08 21:19:30 +0800 |
|---|---|---|
| committer | shuobatian <[email protected]> | 2021-04-08 21:19:30 +0800 |
| commit | 7355e4b6f3726dd4b2d3fa94292696c88360b3fc (patch) | |
| tree | 412ccaf34901687f2370c752239701820731fe93 | |
| parent | 3d3752e52bc0e99e2fc943dcc06bf3edb2141343 (diff) | |
| parent | a8fb6109e0ffc4e0cbdb6c3790702f180ff5ffe7 (diff) | |
Merge branch 'fudfe' into gitee_master
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_common.c | 2 | ||||
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_common.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.c b/bsp/stm32/libraries/HAL_Drivers/drv_common.c index 82ec1f8985..74007b6e88 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c @@ -168,7 +168,7 @@ RT_WEAK void rt_hw_board_init() #endif /* Set the shell console output device */ -#ifdef RT_USING_CONSOLE +#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE) rt_console_set_device(RT_CONSOLE_DEVICE_NAME); #endif diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.h b/bsp/stm32/libraries/HAL_Drivers/drv_common.h index c45041129d..83ef259308 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_common.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.h @@ -13,7 +13,9 @@ #include <rtthread.h> #include <rthw.h> +#ifdef RT_USING_DEVICE #include <rtdevice.h> +#endif #ifdef __cplusplus extern "C" { |