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
commit 93de68129e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 373 additions and 337 deletions

File diff suppressed because it is too large Load Diff

View File

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

View File

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