From 3ff310e31498d8d8fa26a9ad9f71f82004a0f4c9 Mon Sep 17 00:00:00 2001 From: cfif Date: Sun, 21 Jun 2026 18:02:50 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CanSpamReceiver.c | 4 ++-- CanSpamTransmitter.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CanSpamReceiver.c b/CanSpamReceiver.c index e0c80a1..6e05b94 100644 --- a/CanSpamReceiver.c +++ b/CanSpamReceiver.c @@ -51,7 +51,7 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) { } void get_CanSpamReceiver(tCanSpamReceiver *env) { - if (osMutexAcquire(env->modelTaskAccess, 5000) == osOK) { + if (osMutexAcquire(env->access, 5000) == osOK) { // memcpy(&rtDW.TM_CP_model, &ccu_candb_rx.TM_CP, sizeof(rtDW.TM_CP_model)); memcpy(&rtDW.FIU_CCU1_MODEL, &ccu_candb_rx.FIU_CCU1, sizeof(rtDW.FIU_CCU1_MODEL)); memcpy(&rtDW.FIU_CCU2_MODEL, &ccu_candb_rx.FIU_CCU2, sizeof(rtDW.FIU_CCU2_MODEL)); @@ -65,7 +65,7 @@ void get_CanSpamReceiver(tCanSpamReceiver *env) { memcpy(&rtDW.CCUCAN_EMS_HVC_REQ_MSG_MODEL, &ccu_candb_rx.EMS_HVC_Req_Msg, sizeof(rtDW.CCUCAN_EMS_HVC_REQ_MSG_MODEL)); memcpy(&rtDW.HVC_ERR_STATUS_MSG_MODEL, &ccu_candb_rx.HVC_Err_Status_Msg, sizeof(rtDW.HVC_ERR_STATUS_MSG_MODEL)); - osMutexRelease(env->modelTaskAccess); + osMutexRelease(env->access); } else { LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver"); } diff --git a/CanSpamTransmitter.c b/CanSpamTransmitter.c index 68f7595..9ac695b 100644 --- a/CanSpamTransmitter.c +++ b/CanSpamTransmitter.c @@ -272,13 +272,13 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { } void set_CanSpamTransmitter(tCanSpamTransmitter *env) { - if (osMutexAcquire(env->modelTaskAccess, 5000) == osOK) { + if (osMutexAcquire(env->access, 5000) == osOK) { memcpy(&ccu_candb_tx.CCU_Errors, &rtY.CCU_Errors_model, sizeof(ccu_candb_tx.CCU_Errors)); memcpy(&ccu_candb_tx.CCU_Stat1, &rtY.CCU_Stat1_model, sizeof(ccu_candb_tx.CCU_Stat1)); memcpy(&ccu_candb_tx.CCU_Stat2, &rtY.CCU_Stat2_model, sizeof(ccu_candb_tx.CCU_Stat2)); memcpy(&ccu_candb_tx.CCU_HVC_Req_Msg, &rtY.CCUCAN_HVC_REQ_MSG_MODEL, sizeof(ccu_candb_tx.CCU_HVC_Req_Msg)); - osMutexRelease(env->modelTaskAccess); + osMutexRelease(env->access); } else { LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanSpamTransmitter"); } @@ -295,7 +295,6 @@ void set_CCU_Mute(tCanSpamTransmitter *env, bool mute) { static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { for (;;) { - set_CanSpamTransmitter(env); if (osMutexAcquire(env->access, 5000) == osOK) { @@ -305,6 +304,7 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { while (isEventTransmitter(env) != event_CCU_none) { sendEventToCan(env); + env->timeMs = GetSystemTick(); } } @@ -313,7 +313,7 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { } else { LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanSpamTransmitter_Thread"); } - SystemDelayMs(1); + SystemDelayMs(100); } }