浏览代码

Merge pull request #2780 from zhangjun1996/master

修复由于stm32系列的can驱动编译错误
Bernard Xiong 6 年之前
父节点
当前提交
93de68129e
共有 3 个文件被更改,包括 362 次插入320 次删除
  1. 353 313
      bsp/stm32/libraries/HAL_Drivers/drv_can.c
  2. 8 6
      bsp/stm32/libraries/HAL_Drivers/drv_can.h
  3. 1 1
      components/drivers/Kconfig

文件差异内容过多而无法显示
+ 353 - 313
bsp/stm32/libraries/HAL_Drivers/drv_can.c


+ 8 - 6
bsp/stm32/libraries/HAL_Drivers/drv_can.h

@@ -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__ */

+ 1 - 1
components/drivers/Kconfig

@@ -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

部分文件因为文件数量过多而无法显示