Обновление

This commit is contained in:
cfif 2025-12-02 17:37:27 +03:00
parent 7b6c99c81a
commit be1869c7a0
1 changed files with 52 additions and 49 deletions

View File

@ -657,16 +657,20 @@ lin_event_id_t Lin0_Scheduler(tLinTaskActuator *env) {
} }
} }
lin_event_id_t res;
for (uint8_t i = 0; i < LIN0_ISSR_ALL; ++i) { for (uint8_t i = 0; i < LIN0_ISSR_ALL; ++i) {
res = ISSR_x(env->linIo, env->linData, ret = ISSR_x(env->linIo, env->linData,
i, i,
&env->linStateActuator[i].BLOCK_MT, &env->linStateActuator[i].BLOCK_MT,
&env->linStateActuator[i].CPOS_ALL, &env->linStateActuator[i].CPOS_ALL,
&env->linStateActuator[i].DIAGNOSE_MT); &env->linStateActuator[i].DIAGNOSE_MT);
if (ret == LIN_RX_COMPLETED) {
if ((env->linStateActuator[i].DIAGNOSE_MT) || (env->linCommandActuator[i].isRFR_STA)) {
env->linCommandActuator[i].isRFR_STA = 0;
ret = DFR_STA_x(env->linIo, env->linData, i); ret = DFR_STA_x(env->linIo, env->linData, i);
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
@ -682,10 +686,6 @@ lin_event_id_t Lin0_Scheduler(tLinTaskActuator *env) {
eStall_STA Stall_Slave; eStall_STA Stall_Slave;
eReset_STA Reset_Slave; eReset_STA Reset_Slave;
if ((env->linStateActuator[i].DIAGNOSE_MT) || (env->linCommandActuator[i].isRFR_STA)) {
env->linCommandActuator[i].isRFR_STA = 0;
ret = RFR_STA_x(env->linIo, env->linData, ret = RFR_STA_x(env->linIo, env->linData,
&BUS_ADR, &BUS_ADR,
&CPOS_ALL, &CPOS_ALL,
@ -728,9 +728,12 @@ lin_event_id_t Lin0_Scheduler(tLinTaskActuator *env) {
return ret; return ret;
} }
} else {
return ret;
}
} }
if ((res == LIN_TX_COMPLETED) || (res == LIN_RX_COMPLETED)) { if ((ret == LIN_TX_COMPLETED) || (ret == LIN_RX_COMPLETED)) {
} else { } else {
return ret; return ret;