未验证 提交 93de6812 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #2780 from zhangjun1996/master

修复由于stm32系列的can驱动编译错误
...@@ -36,17 +36,19 @@ struct stm_baud_rate_tab ...@@ -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__ */
...@@ -48,7 +48,7 @@ config RT_USING_CAN ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册