HVAC_M7
/
CanSerialPortFrame_TP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление командировка

This commit is contained in:
Дарья Бараева 2026-02-19 12:09:37 +03:00
parent c43e8a295a
commit 9b47c6cc28
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Src/CanSerialPortFrameTP.c
View File

@ -96,6 +96,7 @@ char *sendLogCanTpHex(tCanSerialPortFrameTp *env, uint8_t *data, size_t size) {
uint16_t sendFlowFrame(tCanSerialPortFrameTp *env, uint32_t id, uint32_t timeout) { uint16_t sendFlowFrame(tCanSerialPortFrameTp *env, uint32_t id, uint32_t timeout) {
uint8_t dataTpFrame[8]; uint8_t dataTpFrame[8];
memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame)); memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame));
eTpFrameFC *frame = (eTpFrameFC *) dataTpFrame; eTpFrameFC *frame = (eTpFrameFC *) dataTpFrame;
@ -113,6 +114,7 @@ uint16_t sendFlowFrame(tCanSerialPortFrameTp *env, uint32_t id, uint32_t timeout
uint16_t sendSingleFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, uint32_t id, uint32_t timeout) { uint16_t sendSingleFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, uint32_t id, uint32_t timeout) {
uint8_t dataTpFrame[8]; uint8_t dataTpFrame[8];
memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame)); memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame));
eTpFrameSF *frame = (eTpFrameSF *) dataTpFrame; eTpFrameSF *frame = (eTpFrameSF *) dataTpFrame;
@ -129,6 +131,7 @@ uint16_t sendSingleFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t siz
uint16_t sendConsecutiveFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, uint32_t id, uint8_t sn, uint16_t sendConsecutiveFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, uint32_t id, uint8_t sn,
uint32_t timeout) { uint32_t timeout) {
uint8_t dataTpFrame[8]; uint8_t dataTpFrame[8];
memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame)); memset(dataTpFrame, TP_FRAME_PADDING, sizeof(dataTpFrame));
@ -138,6 +141,7 @@ uint16_t sendConsecutiveFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_
memcpy(&frame->data[0], data, size); memcpy(&frame->data[0], data, size);
SystemDelayMs(25);
uint16_t sent = env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id, uint16_t sent = env->ioCanFrame->transmit(env->ioCanFrame->env, (uint8_t *) frame, 8, id,
PROTOCOL_CAN_TYPE_UDS, timeout); PROTOCOL_CAN_TYPE_UDS, timeout);
@ -198,9 +202,10 @@ bool sendFirstFrame(tCanSerialPortFrameTp *env, uint8_t *data, uint16_t size, ui
pDataLen += 7; pDataLen += 7;
++sn; ++sn;
if (sn == 15) if (sn == 15) {
sn = 1; sn = 1;
} }
}
if (sizePacketTail) { if (sizePacketTail) {
sendConsecutiveFrame(env, &data[pDataLen], sizePacketTail, id, sn, timeout); sendConsecutiveFrame(env, &data[pDataLen], sizePacketTail, id, sn, timeout);
@ -407,8 +412,8 @@ _Noreturn void CanTpProcessing_ListenerTask(tCanSerialPortFrameTp *env) {
} }
if (result == TP_RECEIVED_DATA) { if (result == TP_RECEIVED_DATA) {
//sendLogCanTpHex(env, env->dataBuf->data, env->dataBuf->len); sendLogCanTpHex(env, env->dataBuf->data, env->dataBuf->len);
//LoggerFormatInfo(LOGGER, LOG_SIGN, "Data received: %s", env->hexString) LoggerFormatInfo(LOGGER, LOG_SIGN, "Data received: %s", env->hexString)
env->receivedTP_func(env->callback_argTp, env->dataBuf); env->receivedTP_func(env->callback_argTp, env->dataBuf);