From b7471cd7144c78e5c699a5d782376169c1613ca5 Mon Sep 17 00:00:00 2001 From: cfif Date: Thu, 16 Apr 2026 16:41:24 +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 --- LinActuatorTasks.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/LinActuatorTasks.c b/LinActuatorTasks.c index 8e991f7..c555321 100644 --- a/LinActuatorTasks.c +++ b/LinActuatorTasks.c @@ -711,8 +711,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { if (env->linCommandActuator[i].BUS_ADR == 0) { #if (LOG_LIN_ACTUATOR == 1) - LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", - env->linCommandActuator[i].BUS_ADR, + LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)", + env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].MODE) #endif continue; @@ -721,8 +721,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { if (env->linCommandActuator[i].COM == LIN_ACT_CFR_MOD) { #if (LOG_LIN_ACTUATOR == 1) - LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", - env->linCommandActuator[i].BUS_ADR, + LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)", + env->linCommandActuator[i].BUS_ADR, i, env->linCommandActuator[i].MODE) #endif ret = CFR_MOD_x(env->linIo, env->linData, env->linCommandActuator[i].BUS_ADR | 0x20, @@ -740,8 +740,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { } else { #if (LOG_LIN_ACTUATOR == 1) - LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Command failed [%d]: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", - env->linCommandActuator[i].BUS_ADR, + LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Command failed [%d]: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)", + env->linCommandActuator[i].BUS_ADR, i, env->linCommandActuator[i].MODE) #endif setState20(env, true, i); @@ -755,8 +755,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { if (env->linCommandActuator[i].BUS_ADR == 0) { #if (LOG_LIN_ACTUATOR == 1) - LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_INI (ADR = %d POS = %d)", - env->linCommandActuator[i].BUS_ADR, + LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_INI (ADR = %d (%d) POS = %d)", + env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].POS) #endif continue; @@ -799,8 +799,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { if (env->linCommandActuator[i].BUS_ADR == 0) { #if (LOG_LIN_ACTUATOR == 1) LoggerFormatInfo(LOGGER, env->SIGN_LOG, - "Let's skip the command: LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", - env->linCommandActuator[i].BUS_ADR, + "Let's skip the command: LIN_ACT_CFR_SET (ADR = %d POS = %d (%d) STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", + env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].POS, env->linCommandActuator[i].Stall_SET, env->linCommandActuator[i].Lnoise_SET, @@ -984,6 +984,9 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { if ((env->linStateActuator[BUS_ADR].CPOS_ALL != CPOS_ALL) || (env->linStateActuator[BUS_ADR].Emrf_Slave != Emrf_Slave) || (env->linStateActuator[BUS_ADR].Mode_Slave != Mode_Slave) || + + (env->linStateActuator[BUS_ADR].Reset_Slave != Reset_Slave) || + (env->linStateActuator[BUS_ADR].Error1_Supply_Slave != Error1_Supply_Slave) || (env->linStateActuator[BUS_ADR].Error2_Communication_Slave != Error2_Communication_Slave) || (env->linStateActuator[BUS_ADR].Error3_Temperature_Slave != Error3_Temperature_Slave) || @@ -992,11 +995,12 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { ) { #if (LOG_LIN_ACTUATOR == 1) LoggerFormatInfo(LOGGER, env->SIGN_LOG, - "State: ADR = %d CPOS = %d Emrf = %d Mode = %d ErrSupply = %d ErrComm = %d ErrTemp = %d ErrElect = %d", + "State: ADR = %d CPOS = %d Emrf = %d Mode = %d Reset = %d ErrSupply = %d ErrComm = %d ErrTemp = %d ErrElect = %d", BUS_ADR + 1, CPOS_ALL, Emrf_Slave, Mode_Slave, + Reset_Slave, Error1_Supply_Slave, Error2_Communication_Slave, Error3_Temperature_Slave, @@ -1013,6 +1017,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) { env->linStateActuator[BUS_ADR].Error3_Temperature_Slave = Error3_Temperature_Slave; env->linStateActuator[BUS_ADR].Error4_Permanent_Electrical_Slave = Error4_Permanent_Electrical_Slave; + // Для защелкивания (после считывания Stall_Slave сбросится) if (env->linStateActuator[BUS_ADR].Stall_Slave == LIN_STALL_STA_OFF) { env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave;