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-22 12:18:45 +03:00
parent 8842cfba45
commit bfb5f7fd5b
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
LinActuatorTasks.c
View File

@ -711,7 +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 (%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, i + 1, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
@ -740,7 +741,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 (%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, i, env->linCommandActuator[i].BUS_ADR, i,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
@ -755,7 +757,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 (%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, i + 1, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
#endif #endif
@ -985,7 +988,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) {
(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].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) ||
@ -995,9 +998,10 @@ 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 Reset = %d ErrSupply = %d ErrComm = %d ErrTemp = %d ErrElect = %d", "State: ADR = %d CPOS = %d Stall_Slave = %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,
Stall_Slave,
Emrf_Slave, Emrf_Slave,
Mode_Slave, Mode_Slave,
Reset_Slave, Reset_Slave,
@ -1018,18 +1022,15 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env) {
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 сбросится) // Для защелкивания (после считывания Stall_Slave сбросится)
if (env->linStateActuator[BUS_ADR].Stall_Slave == LIN_STALL_STA_OFF) { if (Stall_Slave == LIN_STALL_STA_ON) {
env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave; env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave;
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (Stall_Slave == LIN_STALL_STA_ON) { LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Detect STALL: (ADR = %d POS = %d)",
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Detect STALL: (ADR = %d POS = %d)", BUS_ADR + 1,
BUS_ADR + 1, CPOS_ALL)
CPOS_ALL)
}
#endif #endif
}
}
env->linStateActuator[BUS_ADR].Reset_Slave = Reset_Slave; env->linStateActuator[BUS_ADR].Reset_Slave = Reset_Slave;

2
LinActuatorTasks.h
View File

@ -10,7 +10,7 @@
#include "LinIO.h" #include "LinIO.h"
#include "LoggerInterface.h" #include "LoggerInterface.h"
#define LOG_LIN_ACTUATOR 0 #define LOG_LIN_ACTUATOR 1
typedef struct __attribute__ ((packed)) { typedef struct __attribute__ ((packed)) {
uint8_t BUS_ADR; uint8_t BUS_ADR;