From b4bf7188f148be472820944ca6a800dd72c2433b Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 29 Jun 2026 13:13:45 +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=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=2029.06.2026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inc/CanSerialPortFrameTP.h | 4 +--- Src/CanSerialPortFrameTP.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Inc/CanSerialPortFrameTP.h b/Inc/CanSerialPortFrameTP.h index 831cf62..30f1574 100644 --- a/Inc/CanSerialPortFrameTP.h +++ b/Inc/CanSerialPortFrameTP.h @@ -11,8 +11,6 @@ #include "CmsisRtosThreadUtils.h" #include "SystemMutexCmsis.h" -#define UDS_TP_CAN_HANDLER 1 - #define LOG_UDS_TP 0 #define TP_FRAME_PADDING 0xAA @@ -20,7 +18,7 @@ #define WAIT_FC_FRAME_TIMEOUT 2000 #define WAIT_FF_FRAME_TIMEOUT 2000 -#define WAIT_FRAME_WRITE 1000 +#define WAIT_FRAME_WRITE 100 #define LEN_DEBUG_TP_BUFF 128 diff --git a/Src/CanSerialPortFrameTP.c b/Src/CanSerialPortFrameTP.c index a1893da..7566479 100644 --- a/Src/CanSerialPortFrameTP.c +++ b/Src/CanSerialPortFrameTP.c @@ -107,7 +107,7 @@ uint16_t sendFlowFrame(tCanSerialPortFrameTp *env, uint32_t id, uint32_t timeout // SystemDelayMs(timeout_Br); uint16_t sent = env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id, - PROTOCOL_CAN_TYPE_UDS, timeout, UDS_TP_CAN_HANDLER); + PROTOCOL_CAN_TYPE_UDS, timeout); return sent; } @@ -126,7 +126,7 @@ uint16_t sendSingleFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t siz // SystemDelayMs(timeout_Br); // ?? uint16_t sent = env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id, - PROTOCOL_CAN_TYPE_UDS, timeout, UDS_TP_CAN_HANDLER); + PROTOCOL_CAN_TYPE_UDS, timeout); return sent; } @@ -146,7 +146,7 @@ uint16_t sendConsecutiveFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_ SystemDelayMs(timeout_StMin); uint16_t sent = env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id, - PROTOCOL_CAN_TYPE_UDS, timeout, UDS_TP_CAN_HANDLER); + PROTOCOL_CAN_TYPE_UDS, timeout); return sent; @@ -365,7 +365,7 @@ bool sendFirstFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, ui // SystemDelayMs(timeout_Br); // ?? env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id, - PROTOCOL_CAN_TYPE_UDS, timeout, UDS_TP_CAN_HANDLER); + PROTOCOL_CAN_TYPE_UDS, timeout); bool result = waitFlowControl(env); if (!result)