diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_can.h b/bsp/stm32/libraries/HAL_Drivers/drv_can.h index 7cde5d3882bd94aa52ecf42f0f86d8bfa68d77e3..ba28e6c84673d188728961eba33aadee10e9c6f8 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_can.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_can.h @@ -10,8 +10,8 @@ * 2019-01-26 YLZ redefine `struct stm32_drv_can` add member `Rx1Message` * 2019-02-19 YLZ port to BSP [stm32] */ -#ifndef __CAN_H__ -#define __CAN_H__ +#ifndef __DRV_CAN_H__ +#define __DRV_CAN_H__ #include "board.h" #include #include @@ -49,4 +49,4 @@ extern int rt_hw_can_init(void); #ifdef __cplusplus } #endif -#endif /*__CAN_H__ */ +#endif /*__DRV_CAN_H__ */ diff --git a/bsp/stm32/stm32f103-fire-arbitrary/README.md b/bsp/stm32/stm32f103-fire-arbitrary/README.md index 1818da16f10b0d3ade52360a8fcad4baf318049b..e5f91b812fdc4f5fa5c3bf36b4176abe9610a152 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/README.md +++ b/bsp/stm32/stm32f103-fire-arbitrary/README.md @@ -45,7 +45,7 @@ | 以太网 | 支持 | W5500 | | 电位器 | 支持 | 使用 ADC1 | | SD卡 | 即将支持 | | -| CAN | 即将支持 | | +| CAN | 支持 | | | SDRAM | 即将支持 | | | WIFI ESP8266 | 即将支持 | | | **片上外设** | **支持情况** | **备注** | diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig index cf165a195689a3c19536f62041ddf39cf989d60d..69e15c202f978c0ac1f21f6a5ce4008b1feb2ad3 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig @@ -275,9 +275,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_CAN1 bool "using CAN1" default n - endif - - if BSP_USING_CAN + config BSP_USING_CAN2 bool "using CAN2" default n