From 0b63d834855668b1306ef19e7c8b341c5dac5bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=BF=9E=E9=92=8A?= Date: Wed, 27 Feb 2019 12:20:52 +0800 Subject: [PATCH] =?UTF-8?q?[bsp][stm32][stm32f103-fire-arbitrary]=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/libraries/HAL_Drivers/drv_can.h | 6 +++--- bsp/stm32/stm32f103-fire-arbitrary/README.md | 2 +- bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_can.h b/bsp/stm32/libraries/HAL_Drivers/drv_can.h index 7cde5d3882..ba28e6c846 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 1818da16f1..e5f91b812f 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 cf165a1956..69e15c202f 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