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

Обновление

This commit is contained in:
cfif 2026-06-21 18:02:50 +03:00
parent 8a6df4b581
commit 3ff310e314
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CanSpamReceiver.c
View File

@ -51,7 +51,7 @@ static void ListenCanSpamReceiver(tCanSpamReceiver *env) {
} }
void get_CanSpamReceiver(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.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_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_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.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)); 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 { } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver"); LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error get_CanSpamReceiver");
} }

8
CanSpamTransmitter.c
View File

@ -272,13 +272,13 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) {
} }
void set_CanSpamTransmitter(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_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_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_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)); 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 { } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanSpamTransmitter"); 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) { static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
for (;;) { for (;;) {
set_CanSpamTransmitter(env);
if (osMutexAcquire(env->access, 5000) == osOK) { if (osMutexAcquire(env->access, 5000) == osOK) {
@ -305,6 +304,7 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
while (isEventTransmitter(env) != event_CCU_none) { while (isEventTransmitter(env) != event_CCU_none) {
sendEventToCan(env); sendEventToCan(env);
env->timeMs = GetSystemTick();
} }
} }
@ -313,7 +313,7 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
} else { } else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanSpamTransmitter_Thread"); LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanSpamTransmitter_Thread");
} }
SystemDelayMs(1); SystemDelayMs(100);
} }
} }