libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2780 from zhangjun1996/master 

修复由于stm32系列的can驱动编译错误
This commit is contained in:
Bernard Xiong 2019-06-17 20:05:27 +08:00 committed by GitHub
parent 2acfc7009c c4b527a738
commit 93de68129e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 373 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

694
bsp/stm32/libraries/HAL_Drivers/drv_can.c
View File

File diff suppressed because it is too large Load Diff

14
bsp/stm32/libraries/HAL_Drivers/drv_can.h
View File

@ -36,17 +36,19 @@ struct stm_baud_rate_tab
struct stm32_drv_can struct stm32_drv_can
{ {
CAN_HandleTypeDef CanHandle; CAN_HandleTypeDef CanHandle;
CanTxMsgTypeDef TxMessage; CAN_TxHeaderTypeDef TxMessage;
CanRxMsgTypeDef RxMessage; CAN_RxHeaderTypeDef RxMessage;
CanRxMsgTypeDef Rx1Message; uint8_t RxMessage_Data[8];
CAN_FilterConfTypeDef FilterConfig; CAN_RxHeaderTypeDef Rx1Message;
uint8_t Rx1Message_Data[8];
CAN_FilterTypeDef FilterConfig;
}; };
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern int rt_hw_can_init(void); extern int rt_hw_can_init(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /*__DRV_CAN_H__ */ #endif /*__DRV_CAN_H__ */

2
components/drivers/Kconfig
View File

@ -48,7 +48,7 @@ config RT_USING_CAN
if RT_USING_CAN if RT_USING_CAN
config RT_CAN_USING_HDR config RT_CAN_USING_HDR
bool "Enable CAN hardware filter" bool "Enable CAN hardware filter"
default y default n
endif endif
config RT_USING_HWTIMER config RT_USING_HWTIMER