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-02-16 16:48:49 +03:00
parent 4023c117d7
commit a4a19740bc
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
LinActuatorTasks.c
View File

@ -576,8 +576,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Sending a command (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", LoggerFormatInfo(LOGGER, LOG_SIGN, "Sending a command (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].MODE) env->linCommandActuator[0].MODE)
#endif #endif
ret = CFR_MOD_x(env->linIo, env->linData, env->linCommandActuator[0].BUS_ADR | 0x20, ret = CFR_MOD_x(env->linIo, env->linData, env->linCommandActuator[0].BUS_ADR | 0x20,
env->linCommandActuator[0].MODE); env->linCommandActuator[0].MODE);
@ -585,16 +585,17 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].MODE) env->linCommandActuator[0].MODE)
#endif #endif
setState20(env, false, 0); setState20(env, false, 0);
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Command failed (BROADCAST) [%d]: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", LoggerFormatInfo(LOGGER, LOG_SIGN,
env->linCommandActuator[0].BUS_ADR, "Command failed (BROADCAST) [%d]: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[0].MODE) env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].MODE)
#endif #endif
setState20(env, true, 0); setState20(env, true, 0);
} }
@ -605,8 +606,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if (env->linCommandActuator[0].COM == LIN_ACT_CFR_INI) { if (env->linCommandActuator[0].COM == LIN_ACT_CFR_INI) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Sending a command (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)", LoggerFormatInfo(LOGGER, LOG_SIGN, "Sending a command (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS) env->linCommandActuator[0].POS)
#endif #endif
ret = CFR_INI_x(env->linIo, env->linData, ret = CFR_INI_x(env->linIo, env->linData,
env->linCommandActuator[0].BUS_ADR | 0x20, env->linCommandActuator[0].BUS_ADR | 0x20,
@ -615,16 +616,16 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].POS) env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].POS)
#endif #endif
setState20(env, false, 0); setState20(env, false, 0);
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Command failed (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)", LoggerFormatInfo(LOGGER, LOG_SIGN, "Command failed (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS) env->linCommandActuator[0].POS)
#endif #endif
setState20(env, true, 0); setState20(env, true, 0);
} }
@ -636,15 +637,15 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if (env->linCommandActuator[0].COM == LIN_ACT_CFR_SET) { if (env->linCommandActuator[0].COM == LIN_ACT_CFR_SET) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"Sending a command (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Sending a command (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS, env->linCommandActuator[0].POS,
env->linCommandActuator[0].Stall_SET, env->linCommandActuator[0].Stall_SET,
env->linCommandActuator[0].Lnoise_SET, env->linCommandActuator[0].Lnoise_SET,
env->linCommandActuator[0].Autos_SET, env->linCommandActuator[0].Autos_SET,
env->linCommandActuator[0].Speed_SET, env->linCommandActuator[0].Speed_SET,
env->linCommandActuator[0].Coils_Stop_SET env->linCommandActuator[0].Coils_Stop_SET
) )
#endif #endif
ret = CFR_SET_x(env->linIo, env->linData, ret = CFR_SET_x(env->linIo, env->linData,
env->linCommandActuator[0].BUS_ADR | 0x20, env->linCommandActuator[0].BUS_ADR | 0x20,
@ -658,29 +659,29 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS, env->linCommandActuator[0].POS,
env->linCommandActuator[0].Stall_SET, env->linCommandActuator[0].Stall_SET,
env->linCommandActuator[0].Lnoise_SET, env->linCommandActuator[0].Lnoise_SET,
env->linCommandActuator[0].Autos_SET, env->linCommandActuator[0].Autos_SET,
env->linCommandActuator[0].Speed_SET, env->linCommandActuator[0].Speed_SET,
env->linCommandActuator[0].Coils_Stop_SET) env->linCommandActuator[0].Coils_Stop_SET)
#endif #endif
setState20(env, false, 0); setState20(env, false, 0);
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"Command failed (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Command failed (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS, env->linCommandActuator[0].POS,
env->linCommandActuator[0].Stall_SET, env->linCommandActuator[0].Stall_SET,
env->linCommandActuator[0].Lnoise_SET, env->linCommandActuator[0].Lnoise_SET,
env->linCommandActuator[0].Autos_SET, env->linCommandActuator[0].Autos_SET,
env->linCommandActuator[0].Speed_SET, env->linCommandActuator[0].Speed_SET,
env->linCommandActuator[0].Coils_Stop_SET env->linCommandActuator[0].Coils_Stop_SET
) )
#endif #endif
setState20(env, true, 0); setState20(env, true, 0);
@ -880,9 +881,6 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
if ((env->linCommandActuator[i].COM == LIN_ACT_CFR_NONE) || if ((env->linCommandActuator[i].COM == LIN_ACT_CFR_NONE) ||
(env->linCommandActuator[i].COM == LIN_ACT_CFR_SUCCESSFUL) || (env->linCommandActuator[i].isRFR_STA)) { (env->linCommandActuator[i].COM == LIN_ACT_CFR_SUCCESSFUL) || (env->linCommandActuator[i].isRFR_STA)) {
env->linCommandActuator[i].isRFR_STA = 0;
uint8_t BUS_ADR = 0; uint8_t BUS_ADR = 0;
uint16_t CPOS_ALL = 0; uint16_t CPOS_ALL = 0;
eEmrf_Slave_STA Emrf_Slave = 0; eEmrf_Slave_STA Emrf_Slave = 0;
@ -923,7 +921,9 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
(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) ||
(env->linStateActuator[BUS_ADR].Error4_Permanent_Electrical_Slave != (env->linStateActuator[BUS_ADR].Error4_Permanent_Electrical_Slave !=
Error4_Permanent_Electrical_Slave)) { Error4_Permanent_Electrical_Slave) ||
(env->linCommandActuator[BUS_ADR].isRFR_STA)
) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
"State: ADR = %d CPOS = %d Emrf = %d Mode = %d Err1 = %d Err2 = %d Err3 = %d Err4 = %d", "State: ADR = %d CPOS = %d Emrf = %d Mode = %d Err1 = %d Err2 = %d Err3 = %d Err4 = %d",
@ -975,7 +975,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
env->linStateActuator[i].error_connect = 1; env->linStateActuator[i].error_connect = 1;
} }
env->linCommandActuator[i].isRFR_STA = 0;
} }
// } else { // } else {