From 7341b2605741e43ab2a41a7a6367e640c315ec1e Mon Sep 17 00:00:00 2001
From: darya
Date: Tue, 23 Jun 2026 09:04:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=2023.06.2026?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Src/fc7xxx_driver_flexcan.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/Src/fc7xxx_driver_flexcan.c b/Src/fc7xxx_driver_flexcan.c
index fb2642a..960e319 100644
--- a/Src/fc7xxx_driver_flexcan.c
+++ b/Src/fc7xxx_driver_flexcan.c
@@ -2022,13 +2022,6 @@ FLEXCAN_ErrorType FLEXCAN_Stop(uint8_t u8CanIndex)
return tRetVal;
}
-#ifndef USING_BOOT
-#include "cmsis_os2.h"
-
-extern osMessageQueueId_t txDataQueueCan0;
-extern osMessageQueueId_t txDataQueueCan1;
-#endif
-
/**
* @brief Transmit data, if tx disable, must call FLEXCAN_TransmitProcess after transmiting
*
@@ -2167,21 +2160,19 @@ FLEXCAN_ErrorType FLEXCAN_TransmitData(uint8_t u8CanIndex, const FLEXCAN_TxMsgTy
/* CODE set 0x0C to transmit */
FLEXCAN_MB_CODE_SET(u32TempAddr, 0x0CU);
-#ifndef USING_BOOT
- if (u8CanIndex == 0) {
- uint8_t u8TxHandler;
- if (osMessageQueueGet(txDataQueueCan0, &u8TxHandler, NULL, pTxMsg->bWaitTxCompleted) == osOK) {
+ if (pTxMsg->bWaitTxCompleted)
+ {
+ }
+ else
+ {
+ u32WordLen = FLEXCAN_HWA_GetFlag1NoFifoFlag(pCan, u8TxRealMbIndex);
+ if (u32WordLen == 0U)
+ {
+ tRetVal = FLEXCAN_ERROR_TIMEOUT;
}
}
- if (u8CanIndex == 1) {
- uint8_t u8TxHandler;
- if (osMessageQueueGet(txDataQueueCan1, &u8TxHandler, NULL, pTxMsg->bWaitTxCompleted) == osOK) {
-
- }
- }
-#endif
/*
if (pTxMsg->bWaitTxCompleted)
{