From 1fb2f942592a5508b25fe09061035e9993880a5c Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 13 Jan 2026 13:25:56 +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 --- CanSpamTransmitter.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/CanSpamTransmitter.c b/CanSpamTransmitter.c index 9e6775d..7d658ed 100644 --- a/CanSpamTransmitter.c +++ b/CanSpamTransmitter.c @@ -213,39 +213,33 @@ static void sendEventToCan(tCanSpamTransmitter *env) { static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { - env->timeMs = GetSystemTick(); - if (env->time_CCU_Stat1_CYC < env->timeMs) { env->time_CCU_Stat1_CYC = env->timeMs + CCU_Stat1_CYC; env->can_id = Pack_CCU_Stat1_candb(&ccu_candb_tx.CCU_Stat1, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_Stat1_CYC; +// return event_CCU_Stat1_CYC; } if (env->time_CCU_Stat2_CYC < env->timeMs) { env->time_CCU_Stat2_CYC = env->timeMs + CCU_Stat2_CYC; env->can_id = Pack_CCU_Stat2_candb(&ccu_candb_tx.CCU_Stat2, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_Stat2_CYC; +// return event_CCU_Stat2_CYC; } if (env->time_CCU_Stat3_CYC < env->timeMs) { env->time_CCU_Stat3_CYC = env->timeMs + CCU_Stat3_CYC; env->can_id = Pack_CCU_Stat3_candb(&ccu_candb_tx.CCU_Stat3, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_Stat3_CYC; +// return event_CCU_Stat3_CYC; } if (env->time_CCU_Errors_CYC < env->timeMs) { env->time_CCU_Errors_CYC = env->timeMs + CCU_Errors_CYC; env->can_id = Pack_CCU_Errors_candb(&ccu_candb_tx.CCU_Errors, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_Errors_CYC; +// return event_CCU_Errors_CYC; } @@ -253,9 +247,8 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->time_CCU_Requests = env->timeMs + CCU_Requests_CYC; env->can_id = Pack_CCU_Requests_candb(&ccu_candb_tx.CCU_Requests, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_Requests; +// return event_CCU_Requests; } // начало--------------------------------------0x310 CCU_HVC_Req_Msg------------------------------------------------ @@ -268,7 +261,6 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->can_id = Pack_CCU_HVC_Req_Msg_candb(&ccu_candb_tx.CCU_HVC_Req_Msg, env->canFrame.data, &env->canFrame.dlc, &env->ide); - return event_CCU_HVC_Req_Msg; } @@ -284,9 +276,8 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->can_id = Pack_CCU_VCU_Msg1_candb(&ccu_candb_tx.CCU_VCU_Msg1, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_VCU_Msg1; +// return event_CCU_VCU_Msg1; } // конец---------------------------------------0x315 CCU_VCU_Msg1--------------------------------------------------- // конец---------------------------------------0x315 CCU_VCU_Msg1--------------------------------------------------- @@ -300,9 +291,8 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->can_id = Pack_CCU_VCU_Msg2_candb(&ccu_candb_tx.CCU_VCU_Msg2, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_VCU_Msg2; +// return event_CCU_VCU_Msg2; } // конец---------------------------------------0x316 CCU_VCU_Msg2--------------------------------------------------- // конец---------------------------------------0x316 CCU_VCU_Msg2--------------------------------------------------- @@ -315,7 +305,6 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->time_CCU_Msg1 = env->timeMs + CCU_Msg1_CYC; CCU_Msg1(env); env->can_id = Pack_CCU_Msg1_candb(&ccu_candb_tx.CCU_Msg1, env->canFrame.data, &env->canFrame.dlc, &env->ide); - return event_CCU_Msg1; } @@ -330,7 +319,6 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->time_CCU_Msg3 = env->timeMs + CCU_Msg3_CYC; CCU_Msg3(env); env->can_id = Pack_CCU_Msg3_candb(&ccu_candb_tx.CCU_Msg3, env->canFrame.data, &env->canFrame.dlc, &env->ide); - return event_CCU_Msg3; } @@ -342,9 +330,8 @@ static eTimeEventTransmit isEventTransmitter(tCanSpamTransmitter *env) { env->time_CCU_AC_Ctrl = env->timeMs + CCU_AC_Ctrl_CYC; env->can_id = Pack_CCU_AC_Ctrl_candb(&ccu_candb_tx.CCU_AC_Ctrl, env->canFrame.data, &env->canFrame.dlc, &env->ide); - - return event_CCU_AC_Ctrl; +// return event_CCU_AC_Ctrl; } return event_CCU_none; @@ -355,6 +342,8 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { for (;;) { if (osMutexAcquire(env->access, 100) == osOK) { + env->timeMs = GetSystemTick(); + while (isEventTransmitter(env) != event_CCU_none) { sendEventToCan(env); }