From 60dd9a1a09870c14add8bec6ce116ce0e9efb0e2 Mon Sep 17 00:00:00 2001 From: cfif Date: Fri, 31 Jul 2026 10:11:04 +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=20UDS=20(=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model_Task.c | 187 --------------------------------------------------- 1 file changed, 187 deletions(-) diff --git a/Model_Task.c b/Model_Task.c index fa1be92..314bca7 100644 --- a/Model_Task.c +++ b/Model_Task.c @@ -577,192 +577,6 @@ static bool setActuatorBusy(tModelTask *env) { return false; } - -/* -static bool setActuatorBusy(tModelTask *env) { - - - if (env->triggerCommand1 == false) { - - - for (uint8_t i = 0; i < env->linTaskActuator1->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch0_Command_Model.COM[i] != 0) { - - env->triggerCommand1 = true; - - memcpy(&env->triggerActuatorCmdBus_1, &Actuator_Ch0_Command_Model, 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]) { - 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]) - 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]) - 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]) - break; - } - - case LIN_ACT_CFR_NONE: { - - 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_Ch0_Command_Model.COM[j]) - } - } - } -#endif -#endif - - - Actuator_Ch0_Status_Model.Busy = 1; - break; - } - } - } - - - if (env->triggerCommand2 == false) { - - for (uint8_t i = 0; i < env->linTaskActuator2->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch1_Command_Model.COM[i] != 0) { - - env->triggerCommand2 = true; - - memcpy(&env->triggerActuatorCmdBus_2, &Actuator_Ch1_Command_Model, 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]) { - 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]) - 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]) - 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]) - break; - } - - case LIN_ACT_CFR_NONE: { - - 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_Ch1_Command_Model.COM[j]) - } - } - } -#endif -#endif - - - Actuator_Ch1_Status_Model.Busy = 1; - break; - } - } - } - - - if (env->triggerCommand3 == false) { - - for (uint8_t i = 0; i < env->linTaskActuator3->LIN_ISSR_ALL; ++i) { - if (Actuator_Ch2_Command_Model.COM[i] != 0) { - - env->triggerCommand3 = true; - - memcpy(&env->triggerActuatorCmdBus_3, &Actuator_Ch2_Command_Model, 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]) { - 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]) - 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]) - 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]) - break; - } - - case LIN_ACT_CFR_NONE: { - - 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[j]) - } - } - } - -#endif -#endif - - Actuator_Ch2_Status_Model.Busy = 1; - break; - } - } - } - - - return false; -} -*/ - __attribute__((section(".save_data"))) volatile CmdCAN_CCU_STAT1_Bus CCU_STAT1_MODEL_SAVE; __attribute__((section(".save_data"))) volatile CmdCAN_CCU_STAT2_Bus CCU_STAT2_MODEL_SAVE; __attribute__((section(".save_data"))) volatile CmdCAN_CCU_STAT3_Bus CCU_STAT3_MODEL_SAVE; @@ -1118,7 +932,6 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { set_Dtc_state(env->diagnostic); - CanUdsInput_Set_Model(env->canUds); env->isRunning = true;