Обновление
This commit is contained in:
parent
472890d8bd
commit
2dad87a670
|
|
@ -2022,11 +2022,13 @@ FLEXCAN_ErrorType FLEXCAN_Stop(uint8_t u8CanIndex)
|
||||||
return tRetVal;
|
return tRetVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef USING_BOOT
|
||||||
#include "cmsis_os2.h"
|
#include "cmsis_os2.h"
|
||||||
|
|
||||||
extern osMessageQueueId_t txDataQueueCan0;
|
extern osMessageQueueId_t txDataQueueCan0;
|
||||||
extern osMessageQueueId_t txDataQueueCan1;
|
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
|
||||||
*
|
*
|
||||||
|
|
@ -2165,7 +2167,7 @@ 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 (u8CanIndex == 0) {
|
if (u8CanIndex == 0) {
|
||||||
uint8_t u8TxHandler;
|
uint8_t u8TxHandler;
|
||||||
if (osMessageQueueGet(txDataQueueCan0, &u8TxHandler, NULL, pTxMsg->bWaitTxCompleted) == osOK) {
|
if (osMessageQueueGet(txDataQueueCan0, &u8TxHandler, NULL, pTxMsg->bWaitTxCompleted) == osOK) {
|
||||||
|
|
@ -2179,7 +2181,7 @@ FLEXCAN_ErrorType FLEXCAN_TransmitData(uint8_t u8CanIndex, const FLEXCAN_TxMsgTy
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
/*
|
/*
|
||||||
if (pTxMsg->bWaitTxCompleted)
|
if (pTxMsg->bWaitTxCompleted)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue