HVAC_M7
/
HVAC_M7_LIN_TASKS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-04-16 16:41:24 +03:00
parent 5d1d0f3ac7
commit b7471cd714
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
LinActuatorTasks.c
View File

@ -711,8 +711,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) {
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
continue; continue;
@ -721,8 +721,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) {
if (env->linCommandActuator[i].COM == LIN_ACT_CFR_MOD) { if (env->linCommandActuator[i].COM == LIN_ACT_CFR_MOD) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR, i,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
ret = CFR_MOD_x(env->linIo, env->linData, env->linCommandActuator[i].BUS_ADR | 0x20, 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 { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Command failed [%d]: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Command failed [%d]: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR, i,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
setState20(env, true, i); 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 (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_INI (ADR = %d POS = %d)", LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Let's skip the command: LIN_ACT_CFR_INI (ADR = %d (%d) POS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
#endif #endif
continue; continue;
@ -799,8 +799,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) {
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, 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)", "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, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].POS, env->linCommandActuator[i].POS,
env->linCommandActuator[i].Stall_SET, env->linCommandActuator[i].Stall_SET,
env->linCommandActuator[i].Lnoise_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) || if ((env->linStateActuator[BUS_ADR].CPOS_ALL != CPOS_ALL) ||
(env->linStateActuator[BUS_ADR].Emrf_Slave != Emrf_Slave) || (env->linStateActuator[BUS_ADR].Emrf_Slave != Emrf_Slave) ||
(env->linStateActuator[BUS_ADR].Mode_Slave != Mode_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].Error1_Supply_Slave != Error1_Supply_Slave) ||
(env->linStateActuator[BUS_ADR].Error2_Communication_Slave != Error2_Communication_Slave) || (env->linStateActuator[BUS_ADR].Error2_Communication_Slave != Error2_Communication_Slave) ||
(env->linStateActuator[BUS_ADR].Error3_Temperature_Slave != Error3_Temperature_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) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, env->SIGN_LOG, 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, BUS_ADR + 1,
CPOS_ALL, CPOS_ALL,
Emrf_Slave, Emrf_Slave,
Mode_Slave, Mode_Slave,
Reset_Slave,
Error1_Supply_Slave, Error1_Supply_Slave,
Error2_Communication_Slave, Error2_Communication_Slave,
Error3_Temperature_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].Error3_Temperature_Slave = Error3_Temperature_Slave;
env->linStateActuator[BUS_ADR].Error4_Permanent_Electrical_Slave = Error4_Permanent_Electrical_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) { if (env->linStateActuator[BUS_ADR].Stall_Slave == LIN_STALL_STA_OFF) {
env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave; env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave;