Обновление

This commit is contained in:
cfif 2026-04-29 15:48:38 +03:00
parent dcbb091a98
commit 796c7eee0f
1 changed files with 38 additions and 13 deletions

View File

@ -48,21 +48,29 @@ static bool setActuatorBusy(tModelTask *env) {
for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch0_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j])
break;
}
default: {
LoggerFormatError(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
LoggerFormatError(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
}
}
}
@ -70,7 +78,6 @@ static bool setActuatorBusy(tModelTask *env) {
#endif
Actuator_Ch0_Status_Model.Busy = 1;
break;
}
@ -93,21 +100,29 @@ static bool setActuatorBusy(tModelTask *env) {
for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch1_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j])
break;
}
default: {
LoggerFormatError(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
LoggerFormatError(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
}
}
}
@ -137,21 +152,29 @@ static bool setActuatorBusy(tModelTask *env) {
for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch2_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j])
break;
}
case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j])
LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j])
break;
}
default: {
LoggerFormatError(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
LoggerFormatError(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i])
}
}
}
@ -182,6 +205,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
env->isRunning = true;
osMutexRelease(env->access);
} else {
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error ModelTask_Thread");
}
SystemDelayMs(100);
}