Обновление 23.06.2026

This commit is contained in:
Дарья Бараева 2026-06-23 09:04:21 +03:00
parent 2dad87a670
commit 7341b26057
1 changed files with 9 additions and 18 deletions

View File

@ -2022,13 +2022,6 @@ FLEXCAN_ErrorType FLEXCAN_Stop(uint8_t u8CanIndex)
return tRetVal; 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 * @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 */ /* CODE set 0x0C to transmit */
FLEXCAN_MB_CODE_SET(u32TempAddr, 0x0CU); FLEXCAN_MB_CODE_SET(u32TempAddr, 0x0CU);
#ifndef USING_BOOT if (pTxMsg->bWaitTxCompleted)
if (u8CanIndex == 0) { {
uint8_t u8TxHandler;
if (osMessageQueueGet(txDataQueueCan0, &u8TxHandler, NULL, pTxMsg->bWaitTxCompleted) == osOK) {
} }
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) if (pTxMsg->bWaitTxCompleted)
{ {