From 796c7eee0fade211147407e89c2121cb8b28edc2 Mon Sep 17 00:00:00 2001 From: cfif Date: Wed, 29 Apr 2026 15:48:38 +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 --- Model_Task.c | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/Model_Task.c b/Model_Task.c index e9cb64c..9cbdcff 100644 --- a/Model_Task.c +++ b/Model_Task.c @@ -48,21 +48,29 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch0_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, + Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, + Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, + Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatError(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, + "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, + Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -70,7 +78,6 @@ static bool setActuatorBusy(tModelTask *env) { #endif - Actuator_Ch0_Status_Model.Busy = 1; break; } @@ -93,21 +100,29 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch1_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, + Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, + Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, + Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatError(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, + "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, + Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -137,21 +152,29 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch2_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, + Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, + Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, + "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, + Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatError(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, + "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, + Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -182,6 +205,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { env->isRunning = true; osMutexRelease(env->access); + } else { + LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error ModelTask_Thread"); } SystemDelayMs(100); }