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-15 12:09:44 +03:00
parent 8cbc629313
commit deff348010
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
LinActuatorTasks.c
View File

@ -723,8 +723,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
if (setState20(env, false, i)) setState20(env, false, i);
break;
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
@ -732,8 +732,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
#endif #endif
if (setState20(env, true, i)) setState20(env, true, i);
break;
} }
} }
@ -767,16 +766,16 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
"Command completed successfully: LIN_ACT_CFR_INI (ADR = %d POS = %d)", "Command completed successfully: LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].POS) env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].POS)
#endif #endif
if (setState20(env, false, i)) setState20(env, false, i);
break;
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, "Command failed: LIN_ACT_CFR_INI (ADR = %d POS = %d)", LoggerFormatInfo(LOGGER, LOG_SIGN, "Command failed: LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
#endif #endif
if (setState20(env, true, i)) setState20(env, true, i);
break;
} }
@ -834,8 +833,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
env->linCommandActuator[i].Coils_Stop_SET env->linCommandActuator[i].Coils_Stop_SET
) )
#endif #endif
if (setState20(env, false, i)) setState20(env, false, i);
break;
} else { } else {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
LoggerFormatInfo(LOGGER, LOG_SIGN, LoggerFormatInfo(LOGGER, LOG_SIGN,
@ -849,8 +848,8 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
env->linCommandActuator[i].Coils_Stop_SET env->linCommandActuator[i].Coils_Stop_SET
) )
#endif #endif
if (setState20(env, true, i)) setState20(env, true, i);
break;
} }
} }
@ -1057,32 +1056,19 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, char *LOG_SIGN) {
return LIN_NO_EVENT; return LIN_NO_EVENT;
} }
bool setBusy(tLinTaskActuator *env) {
for (uint8_t i = 0; i < env->LIN_ISSR_ALL; ++i) {
if ((env->linCommandActuator[i].COM != LIN_ACT_CFR_NONE) &&
(env->linCommandActuator[i].COM != LIN_ACT_CFR_SUCCESSFUL)) {
env->busy = true;
return true;
}
}
return false;
}
void resetStall(tLinTaskActuator *env, uint8_t *dataLocalStall, char *LOG_SIGN) { void resetStall(tLinTaskActuator *env, uint8_t *dataLocalStall, char *LOG_SIGN) {
#if (LOG_LIN_ACTUATOR == 1)
LoggerInfoStatic(LOGGER, LOG_SIGN, "Reset STALL (DETECT STALL RESET)")
#endif
for (uint8_t i = 0; i < env->LIN_ISSR_ALL; ++i) { for (uint8_t i = 0; i < env->LIN_ISSR_ALL; ++i) {
// if (env->linCommandActuator[i].COM == LIN_ACT_CFR_SET) { // if (env->linCommandActuator[i].COM == LIN_ACT_CFR_SET) {
#if (LOG_LIN_ACTUATOR == 1) // !!!!!! env->linStateActuator[i].Stall_Slave = LIN_STALL_STA_OFF;
LoggerInfoStatic(LOGGER, LOG_SIGN, "Reset STALL (DETECT STALL RESET)")
#endif
env->linStateActuator[i].Stall_Slave = LIN_STALL_STA_OFF;
dataLocalStall[i] = LIN_STALL_STA_OFF; dataLocalStall[i] = LIN_STALL_STA_OFF;
/*
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
for (uint8_t j = 0; j < env->LIN_ISSR_ALL; ++j) { for (uint8_t j = 0; j < env->LIN_ISSR_ALL; ++j) {
@ -1092,7 +1078,7 @@ void resetStall(tLinTaskActuator *env, uint8_t *dataLocalStall, char *LOG_SIGN)
return; return;
} }
*/
// } // }
} }

1
LinActuatorTasks.h
View File

@ -491,6 +491,5 @@ void Lin3_StartThread(tLinTaskActuator *env);
void GetLin123CallbackHandler(tLinData *env, uint8_t u8LinIndex, void *state); void GetLin123CallbackHandler(tLinData *env, uint8_t u8LinIndex, void *state);
void resetStall(tLinTaskActuator *env, uint8_t *dataLocalStall, char *LOG_SIGN); void resetStall(tLinTaskActuator *env, uint8_t *dataLocalStall, char *LOG_SIGN);
bool setBusy(tLinTaskActuator *env);
#endif //HVAC_LIN_TASKS_H #endif //HVAC_LIN_TASKS_H