From c7e0ee86ec13bf3bdcaa6bec531373a40332ec9b Mon Sep 17 00:00:00 2001 From: cfif Date: Wed, 3 Jun 2026 16:38:48 +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=BB=D0=B0=D1=82=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CanSpamReceiver.c | 7 +++++-- CanSpamTransmitter.c | 2 ++ CanSpamTransmitter.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CanSpamReceiver.c b/CanSpamReceiver.c index 2ff8c81..3202fab 100644 --- a/CanSpamReceiver.c +++ b/CanSpamReceiver.c @@ -50,15 +50,18 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) { void get_CanSpamReceiver(tCanSpamReceiver *env) { 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)); +// memcpy(&rtDW.FIU_CCU3_MODEL, &ccu_candb_rx.FIU_CCU3, sizeof(rtDW.FIU_CCU3_MODEL)); memcpy(&rtDW.CCUCAN_BCM_Powertrain_model, &ccu_candb_rx.BCM_Powertrain, sizeof(rtDW.CCUCAN_BCM_Powertrain_model)); + memcpy(&rtDW.CCUCAN_BCM_Climatic_model, &ccu_candb_rx.BCM_CLIMATIC_DATA, sizeof(rtDW.CCUCAN_BCM_Climatic_model)); memcpy(&rtDW.CCUCAN_EMS_Veh_model, &ccu_candb_rx.EMS_Veh, sizeof(rtDW.CCUCAN_EMS_Veh_model)); memcpy(&rtDW.CCUCAN_ESC_04_model, &ccu_candb_rx.ESC_04, sizeof(rtDW.CCUCAN_ESC_04_model)); - memcpy(&rtDW.CCUCAN_BCM_Climatic_model, &ccu_candb_rx.BCM_CLIMATIC_DATA, sizeof(rtDW.CCUCAN_BCM_Climatic_model)); - memcpy(&rtDW.CCUCAN_BCM_VEH_STATE_model, &ccu_candb_rx.BCM_VEH_STATE, sizeof(rtDW.CCUCAN_BCM_VEH_STATE_model)); + 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->access); } else { diff --git a/CanSpamTransmitter.c b/CanSpamTransmitter.c index d6925af..224e413 100644 --- a/CanSpamTransmitter.c +++ b/CanSpamTransmitter.c @@ -266,6 +266,8 @@ void set_CanSpamTransmitter(tCanSpamTransmitter *env) { 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->access); } else { LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanSpamTransmitter"); diff --git a/CanSpamTransmitter.h b/CanSpamTransmitter.h index 1d40066..af8df28 100644 --- a/CanSpamTransmitter.h +++ b/CanSpamTransmitter.h @@ -16,7 +16,7 @@ #define CCU_Errors_SEND 1 #define CCU_Requests_SEND 0 -#define CCU_HVC_Req_Msg_SEND 0 +#define CCU_HVC_Req_Msg_SEND 1 #define CCU_VCU_Msg1_SEND 0 #define CCU_VCU_Msg2_SEND 0 #define CCU_Msg1_SEND 0