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

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

This commit is contained in:
Дарья Бараева 2026-06-05 09:38:47 +03:00
parent 7f5c73543c
commit 7d8192f9e2
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CanUds.c
View File

@ -279,12 +279,12 @@ static uint16_t TesterPresent_3E(tCanUds *env) {
testerPresent->ServiceId = UDS_TesterPresent | 0b1000000; testerPresent->ServiceId = UDS_TesterPresent | 0b1000000;
testerPresent->zeroSubFunction = 0; testerPresent->zeroSubFunction = 0;
if (osMutexAcquire(env->access, 1000) == osOK) { // if (osMutexAcquire(env->access, 1000) == osOK) {
env->currentSessionTesterPresentTimeout = SystemGetMs() + timeout_session_S3_Server; // env->currentSessionTesterPresentTimeout = SystemGetMs() + timeout_session_S3_Server;
osMutexRelease(env->access); // osMutexRelease(env->access);
} else { // } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error TesterPresent_3E"); // LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error TesterPresent_3E");
} // }
return 2; return 2;
} }
@ -1395,6 +1395,7 @@ static uint16_t SecurityAccess_27(tCanUds *env) {
// начало --------------------------- RequestDownload --------------------------------------------------------- // начало --------------------------- RequestDownload ---------------------------------------------------------
// начало --------------------------- RequestDownload --------------------------------------------------------- // начало --------------------------- RequestDownload ---------------------------------------------------------
static uint16_t RequestDownload_34(tCanUds *env) { static uint16_t RequestDownload_34(tCanUds *env) {
tRequestDownload_Request *com = (tRequestDownload_Request *) env->data->data; tRequestDownload_Request *com = (tRequestDownload_Request *) env->data->data;
@ -1456,7 +1457,7 @@ static uint16_t RequestDownload_34(tCanUds *env) {
requestDownload_Response->ServiceId = UDS_RequestDownload | 0b1000000; requestDownload_Response->ServiceId = UDS_RequestDownload | 0b1000000;
requestDownload_Response->lengthFormatIdentifier = 0x20; // 2 байта - длина поля maxNumberOfBlockLength requestDownload_Response->lengthFormatIdentifier = 0x20; // 2 байта - длина поля maxNumberOfBlockLength
uint8_t countBlock = 8; uint8_t countBlock = 31;//8;
requestDownload_Response->maxNumberOfBlockLength = countBlock * 128 + 2; requestDownload_Response->maxNumberOfBlockLength = countBlock * 128 + 2;
@ -1513,12 +1514,12 @@ static uint16_t TransferData_36(tCanUds *env) {
//setResponseErrorPending(env, UDS_RoutineControl, UDS_error_requestCorrectlyReceived_ResponsePending); //setResponseErrorPending(env, UDS_RoutineControl, UDS_error_requestCorrectlyReceived_ResponsePending);
if (osMutexAcquire(env->access, 1000) == osOK) { // if (osMutexAcquire(env->access, 1000) == osOK) {
env->currentSessionTesterPresentTimeout = SystemGetMs() + timeout_session_S3_Server; // env->currentSessionTesterPresentTimeout = SystemGetMs() + timeout_session_S3_Server;
osMutexRelease(env->access); // osMutexRelease(env->access);
} else { // } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error TransferData_36"); // LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error TransferData_36");
} // }
bool result = env->write_flash_func(env->AdrFlash, &env->data->data[2], env->data->len - 2); bool result = env->write_flash_func(env->AdrFlash, &env->data->data[2], env->data->len - 2);
@ -1569,6 +1570,7 @@ static uint16_t RequestTransferExit_37(tCanUds *env) {
tRequestTransferExit_Response *requestTransferExit_Response = (tRequestTransferExit_Response *) env->dataResponse; tRequestTransferExit_Response *requestTransferExit_Response = (tRequestTransferExit_Response *) env->dataResponse;
requestTransferExit_Response->ServiceId = UDS_RequestTransferExit | 0b1000000; requestTransferExit_Response->ServiceId = UDS_RequestTransferExit | 0b1000000;
return 1; return 1;
} }
// конец --------------------------- RequestTransferExit --------------------------------------------------------- // конец --------------------------- RequestTransferExit ---------------------------------------------------------
@ -1841,6 +1843,13 @@ void ReceivedTP_func(void *arg, tCanTP_data *data) {
if (uds_com[com].func != NULL) { if (uds_com[com].func != NULL) {
// if (osMutexAcquire(env->access, 1000) == osOK) {
env->currentSessionTesterPresentTimeout = SystemGetMs() + timeout_session_S3_Server;
// osMutexRelease(env->access);
// } else {
// LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error ReceivedTP_func");
// }
#if (LOG_UDS == 1) #if (LOG_UDS == 1)
sendLogCanUdsHex(env, env->data->data, env->data->len); sendLogCanUdsHex(env, env->data->data, env->data->len);
LoggerFormatInfo(LOGGER, LOG_SIGN, "> %s [%d] %s", uds_com[com].desc, env->data->len, env->hexString) LoggerFormatInfo(LOGGER, LOG_SIGN, "> %s [%d] %s", uds_com[com].desc, env->data->len, env->hexString)

2
CanUds.h
View File

@ -18,7 +18,7 @@
#define MAX_ATTEMPTS_DEFAULT 3 #define MAX_ATTEMPTS_DEFAULT 3
#define BLOCK_TIME_DEFAULT 60000 #define BLOCK_TIME_DEFAULT 60000
#define timeout_session_S3_Server 5000 #define timeout_session_S3_Server 7000
#define ADR_HEX_BlockMain 0x01020000 #define ADR_HEX_BlockMain 0x01020000
#define ADR_HEX_BlockCalib 0x010D0000 #define ADR_HEX_BlockCalib 0x010D0000