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-24 13:39:48 +03:00
parent af90f443bf
commit aa7383b3a7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
LinActuatorTasks.c
View File

@ -555,7 +555,7 @@ static bool setState20(tLinTaskActuator *env, bool isError, uint8_t index) {
env->linCommandActuator[j].COM = LIN_ACT_CFR_SUCCESSFUL; env->linCommandActuator[j].COM = LIN_ACT_CFR_SUCCESSFUL;
env->linCommandActuator[j].isRFR_STA = 1; env->linCommandActuator[j].isRFR_STA = 1;
env->linStateActuator[index].Stall_Slave = LIN_STALL_STA_OFF; env->linStateActuator[j].Stall_Slave = LIN_STALL_STA_OFF;
if (isError) { if (isError) {
env->linStateActuator[j].error_connect = 1; env->linStateActuator[j].error_connect = 1;
@ -571,10 +571,12 @@ static bool setState20(tLinTaskActuator *env, bool isError, uint8_t index) {
return false; return false;
} }
#if (LOG_LIN_ACTUATOR == 1)
#define IS_LOGGING_ENABLED(numAct) \ #define IS_LOGGING_ENABLED(numAct) \
( (numAct == 1 && LOG_LIN1_ACTUATOR == 1) || \ ( (numAct == 1 && LOG_LIN1_ACTUATOR == 1) || \
(numAct == 2 && LOG_LIN2_ACTUATOR == 1) || \ (numAct == 2 && LOG_LIN2_ACTUATOR == 1) || \
(numAct == 3 && LOG_LIN3_ACTUATOR == 1) ) (numAct == 3 && LOG_LIN3_ACTUATOR == 1) )
#endif
static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) { static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
@ -743,6 +745,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
} }
#endif #endif
setState20(env, false, i);
continue; continue;
} }
@ -798,6 +801,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
} }
#endif #endif
setState20(env, false, i);
continue; continue;
} }
@ -856,6 +860,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
env->linCommandActuator[i].Coils_Stop_SET) env->linCommandActuator[i].Coils_Stop_SET)
} }
#endif #endif
setState20(env, false, i);
continue; continue;
} }

4
LinActuatorTasks.h
View File

@ -12,8 +12,8 @@
#define LOG_LIN_ACTUATOR 1 #define LOG_LIN_ACTUATOR 1
#define LOG_LIN1_ACTUATOR 1 #define LOG_LIN1_ACTUATOR 1
#define LOG_LIN2_ACTUATOR 0 #define LOG_LIN2_ACTUATOR 1
#define LOG_LIN3_ACTUATOR 0 #define LOG_LIN3_ACTUATOR 1
typedef struct __attribute__ ((packed)) { typedef struct __attribute__ ((packed)) {