Обновление 23.06.2026
This commit is contained in:
parent
eb5628c998
commit
d53f3681fd
|
|
@ -61,7 +61,7 @@ typedef struct {
|
||||||
FLEXCAN_IdType canTypeFrame;
|
FLEXCAN_IdType canTypeFrame;
|
||||||
bool canFilterEnable;
|
bool canFilterEnable;
|
||||||
|
|
||||||
bool reInit;
|
bool reInitOne;
|
||||||
|
|
||||||
uint8_t CountHardSoftFilter_RX;
|
uint8_t CountHardSoftFilter_RX;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,10 +117,6 @@ bool vCanSerialPortFrameDMAInit(
|
||||||
env->DMA_TransferCompleteCallback = DMA_TransferCompleteCallback;
|
env->DMA_TransferCompleteCallback = DMA_TransferCompleteCallback;
|
||||||
env->DMA_ErrorCallback = DMA_ErrorCallback;
|
env->DMA_ErrorCallback = DMA_ErrorCallback;
|
||||||
|
|
||||||
|
|
||||||
env->txDataQueueCan = osMessageQueueNew(1, 1, NULL);
|
|
||||||
env->access = osMutexNew(NULL);
|
|
||||||
|
|
||||||
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
||||||
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
||||||
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
//начало-----------------------------------DMA-RX-------------------------------------------------------------------
|
||||||
|
|
@ -266,8 +262,13 @@ bool vCanSerialPortFrameDMAInit(
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!env->reInit) {
|
if (!env->reInitOne) {
|
||||||
env->reInit = true;
|
|
||||||
|
env->reInitOne = true;
|
||||||
|
|
||||||
|
env->txDataQueueCan = osMessageQueueNew(1, 1, NULL);
|
||||||
|
env->access = osMutexNew(NULL);
|
||||||
|
|
||||||
vCanSerialPortFrameInitStructure(env, 10, 0);
|
vCanSerialPortFrameInitStructure(env, 10, 0);
|
||||||
|
|
||||||
CanSerialPortFrameSetType(env, canTypeFrame);
|
CanSerialPortFrameSetType(env, canTypeFrame);
|
||||||
|
|
@ -325,8 +326,6 @@ bool vCanSerialPortFrameMbInit(
|
||||||
// env->DMA_TransferCompleteCallback = DMA_TransferCompleteCallback;
|
// env->DMA_TransferCompleteCallback = DMA_TransferCompleteCallback;
|
||||||
// env->DMA_ErrorCallback = DMA_ErrorCallback;
|
// env->DMA_ErrorCallback = DMA_ErrorCallback;
|
||||||
|
|
||||||
env->access = osMutexNew(NULL);
|
|
||||||
env->txDataQueueCan = osMessageQueueNew(1, 1, NULL);
|
|
||||||
|
|
||||||
//начало------------------------------------CAN---------------------------------------------------------------------
|
//начало------------------------------------CAN---------------------------------------------------------------------
|
||||||
//начало------------------------------------CAN---------------------------------------------------------------------
|
//начало------------------------------------CAN---------------------------------------------------------------------
|
||||||
|
|
@ -421,8 +420,12 @@ bool vCanSerialPortFrameMbInit(
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!env->reInit) {
|
if (!env->reInitOne) {
|
||||||
env->reInit = true;
|
env->reInitOne = true;
|
||||||
|
|
||||||
|
env->access = osMutexNew(NULL);
|
||||||
|
env->txDataQueueCan = osMessageQueueNew(1, 1, NULL);
|
||||||
|
|
||||||
vCanSerialPortFrameInitStructure(env, 10, 0);
|
vCanSerialPortFrameInitStructure(env, 10, 0);
|
||||||
|
|
||||||
CanSerialPortFrameSetType(env, canTypeFrame);
|
CanSerialPortFrameSetType(env, canTypeFrame);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue