Обновление
This commit is contained in:
parent
1627ce37dc
commit
db66ce5cb5
|
|
@ -547,12 +547,13 @@ static bool setState20(tLinTaskActuator *env, bool isError, uint8_t index) {
|
||||||
env->linStateActuator[index].error_connect = 0;
|
env->linStateActuator[index].error_connect = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
env->linCommandActuator[index].COM = LIN_ACT_CFR_SUCCESSFUL;
|
||||||
env->linCommandActuator[index].isRFR_STA = 1;
|
env->linCommandActuator[index].isRFR_STA = 1;
|
||||||
|
|
||||||
if (env->linCommandActuator[index].BUS_ADR == 0x20) {
|
if (env->linCommandActuator[index].BUS_ADR == 0) {
|
||||||
for (uint8_t j = 0; j < LIN0_ISSR_ALL; ++j) {
|
for (uint8_t j = 0; j < LIN0_ISSR_ALL; ++j) {
|
||||||
|
|
||||||
env->linCommandActuator[j].COM = LIN_ACT_CFR_NONE;
|
env->linCommandActuator[j].COM = LIN_ACT_CFR_SUCCESSFUL;
|
||||||
env->linCommandActuator[j].isRFR_STA = 1;
|
env->linCommandActuator[j].isRFR_STA = 1;
|
||||||
|
|
||||||
if (isError) {
|
if (isError) {
|
||||||
|
|
@ -657,7 +658,7 @@ lin_event_id_t Lin0_Scheduler(tLinTaskActuator *env) {
|
||||||
// env->linStateActuator[i].DIAGNOSE_MT = DIAGNOSE_MT;
|
// env->linStateActuator[i].DIAGNOSE_MT = DIAGNOSE_MT;
|
||||||
|
|
||||||
// if ((env->linStateActuator[i].DIAGNOSE_MT) || (env->linCommandActuator[i].isRFR_STA)) {
|
// if ((env->linStateActuator[i].DIAGNOSE_MT) || (env->linCommandActuator[i].isRFR_STA)) {
|
||||||
if ((env->linCommandActuator[i].COM == LIN_ACT_CFR_NONE) || (env->linCommandActuator[i].isRFR_STA)) {
|
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].isRFR_STA = 0;
|
env->linCommandActuator[i].isRFR_STA = 0;
|
||||||
|
|
||||||
|
|
@ -757,7 +758,7 @@ void resetStall(tLinTaskActuator *env) {
|
||||||
|
|
||||||
env->linStateActuator[i].Stall_Slave = LIN_STALL_STA_OFF;
|
env->linStateActuator[i].Stall_Slave = LIN_STALL_STA_OFF;
|
||||||
|
|
||||||
if (env->linCommandActuator[i].BUS_ADR == 0x20) {
|
if (env->linCommandActuator[i].BUS_ADR == 0) {
|
||||||
|
|
||||||
for (uint8_t j = 0; j < LIN0_ISSR_ALL; ++j) {
|
for (uint8_t j = 0; j < LIN0_ISSR_ALL; ++j) {
|
||||||
env->linStateActuator[j].Stall_Slave = LIN_STALL_STA_OFF;
|
env->linStateActuator[j].Stall_Slave = LIN_STALL_STA_OFF;
|
||||||
|
|
|
||||||
|
|
@ -423,7 +423,8 @@ typedef enum {
|
||||||
LIN_ACT_CFR_NONE = 0,
|
LIN_ACT_CFR_NONE = 0,
|
||||||
LIN_ACT_CFR_MOD = 1,
|
LIN_ACT_CFR_MOD = 1,
|
||||||
LIN_ACT_CFR_INI = 2,
|
LIN_ACT_CFR_INI = 2,
|
||||||
LIN_ACT_CFR_SET = 3
|
LIN_ACT_CFR_SET = 3,
|
||||||
|
LIN_ACT_CFR_SUCCESSFUL = 0xFF
|
||||||
} eLinCOM;
|
} eLinCOM;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue