From 2311809241f4a94e45082f935f3e9664e9d7e4d8 Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 28 Jul 2026 14:39:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81?= =?UTF-8?q?=D1=8B=20=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model_Task.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Model_Task.c b/Model_Task.c index 985115d..9c613df 100644 --- a/Model_Task.c +++ b/Model_Task.c @@ -97,33 +97,33 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t i = 0; i < env->linTaskActuator1->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch0_Command_Model.COM[i] != 0) { + if (rtY.Actuator_Ch0_Command_Model_out.COM[i] != 0) { env->triggerCommand1 = true; - memcpy(&env->triggerActuatorCmdBus_1, &Actuator_Ch0_Command_Model, sizeof(ActuatorCmdBus)); + memcpy(&env->triggerActuatorCmdBus_1, &rtY.Actuator_Ch0_Command_Model_out, sizeof(ActuatorCmdBus)); #if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN1_ACTUATOR == 1) for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) { - switch (Actuator_Ch0_Command_Model.COM[j]) { + switch (rtY.Actuator_Ch0_Command_Model_out.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]) + rtY.Actuator_Ch0_Command_Model_out.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]) + rtY.Actuator_Ch0_Command_Model_out.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]) + rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j]) break; } @@ -136,8 +136,8 @@ static bool setActuatorBusy(tModelTask *env) { LoggerFormatError(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, - Actuator_Ch0_Command_Model.BUS_ADR[j], - Actuator_Ch0_Command_Model.COM[j]) + rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j], + rtY.Actuator_Ch0_Command_Model_out.COM[j]) } } } @@ -155,34 +155,34 @@ static bool setActuatorBusy(tModelTask *env) { if (env->triggerCommand2 == false) { for (uint8_t i = 0; i < env->linTaskActuator2->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch1_Command_Model.COM[i] != 0) { + if (rtY.Actuator_Ch1_Command_Mode_out.COM[i] != 0) { env->triggerCommand2 = true; - memcpy(&env->triggerActuatorCmdBus_2, &Actuator_Ch1_Command_Model, sizeof(ActuatorCmdBus)); + memcpy(&env->triggerActuatorCmdBus_2, &rtY.Actuator_Ch1_Command_Mode_out, sizeof(ActuatorCmdBus)); #if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN2_ACTUATOR == 1) for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) { - switch (Actuator_Ch1_Command_Model.COM[j]) { + switch (rtY.Actuator_Ch1_Command_Mode_out.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]) + rtY.Actuator_Ch1_Command_Mode_out.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]) + rtY.Actuator_Ch1_Command_Mode_out.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]) + rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j]) break; } @@ -195,8 +195,8 @@ static bool setActuatorBusy(tModelTask *env) { LoggerFormatError(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, - Actuator_Ch1_Command_Model.BUS_ADR[j], - Actuator_Ch1_Command_Model.COM[j]) + rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j], + rtY.Actuator_Ch1_Command_Mode_out.COM[j]) } } } @@ -214,34 +214,34 @@ static bool setActuatorBusy(tModelTask *env) { if (env->triggerCommand3 == false) { for (uint8_t i = 0; i < env->linTaskActuator3->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch2_Command_Model.COM[i] != 0) { + if (rtY.Actuator_Ch2_Command_Model_out.COM[i] != 0) { env->triggerCommand3 = true; - memcpy(&env->triggerActuatorCmdBus_3, &Actuator_Ch2_Command_Model, sizeof(ActuatorCmdBus)); + memcpy(&env->triggerActuatorCmdBus_3, &rtY.Actuator_Ch2_Command_Model_out, sizeof(ActuatorCmdBus)); #if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN3_ACTUATOR == 1) for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) { - switch (Actuator_Ch2_Command_Model.COM[j]) { + switch (rtY.Actuator_Ch2_Command_Model_out.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]) + rtY.Actuator_Ch2_Command_Model_out.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]) + rtY.Actuator_Ch2_Command_Model_out.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]) + rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j]) break; } @@ -254,8 +254,8 @@ static bool setActuatorBusy(tModelTask *env) { 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[j]) + rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j], + rtY.Actuator_Ch2_Command_Model_out.COM[j]) } } }