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

Обновление

This commit is contained in:
cfif 2026-04-28 10:39:00 +03:00
parent 0671faca78
commit 72167f7572
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CanUds.c
View File

@ -269,6 +269,8 @@ static uint16_t TesterPresent_3E(tCanUds *env) {
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 {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error TesterPresent_3E");
} }
return 2; return 2;
@ -1385,6 +1387,8 @@ static uint16_t TransferData_36(tCanUds *env) {
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 {
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);
@ -1396,7 +1400,11 @@ static uint16_t TransferData_36(tCanUds *env) {
env->AdrFlash += env->data->len - 2; env->AdrFlash += env->data->len - 2;
env->SizeWriteFlash += env->data->len - 2; env->SizeWriteFlash += env->data->len - 2;
LoggerFormatInfo(LOGGER, LOG_SIGN, "Download: %d of %d kb", env->SizeWriteFlash / 1024 , DownloadFirmwareSize / 1024)
#if (LOG_UDS == 1)
LoggerFormatTrace(LOGGER, LOG_SIGN, "Download: %d of %d kb", env->SizeWriteFlash / 1024 , DownloadFirmwareSize / 1024)
#endif
tTransferData_Response *transferData_Response = (tTransferData_Response *) env->dataResponse; tTransferData_Response *transferData_Response = (tTransferData_Response *) env->dataResponse;
transferData_Response->ServiceId = UDS_TransferData | 0b1000000; transferData_Response->ServiceId = UDS_TransferData | 0b1000000;
@ -1739,9 +1747,9 @@ void CanUds(tCanUds *env) {
(env->currentSessionTesterPresentTimeout < SystemGetMs())) { (env->currentSessionTesterPresentTimeout < SystemGetMs())) {
env->currentSessionTesterPresentTimeout = 0; env->currentSessionTesterPresentTimeout = 0;
//#if (LOG_UDS == 1) #if (LOG_UDS == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Resetting the session to default: %d", UDS_session_defaultSession) LoggerFormatTrace(LOGGER, LOG_SIGN, "Resetting the session to default: %d", UDS_session_defaultSession)
//#endif #endif
setDefaultSecurityAccess(env); setDefaultSecurityAccess(env);
set_CCU_Mute(env->canSpamTransmitter, false); set_CCU_Mute(env->canSpamTransmitter, false);
set_NoBitsDTC(env->Diagnostic, false); set_NoBitsDTC(env->Diagnostic, false);
@ -1751,6 +1759,8 @@ void CanUds(tCanUds *env) {
} }
osMutexRelease(env->access); osMutexRelease(env->access);
} else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanUds");
} }
SystemDelayMs(1000); SystemDelayMs(1000);