HVAC_M7
/
HVAC_M7_MODEL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Изменены интерфейсы актуаторов

This commit is contained in:
cfif 2026-07-28 14:39:36 +03:00
parent 52eec13c1e
commit 2311809241
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Model_Task.c
View File

@ -97,33 +97,33 @@ static bool setActuatorBusy(tModelTask *env) {
for (uint8_t i = 0; i < env->linTaskActuator1->LIN_ISSR_ALL; ++i) { for (uint8_t i = 0; i < env->linTaskActuator1->LIN_ISSR_ALL; ++i) {
if (Actuator_Ch0_Command_Model.COM[i] != 0) { if (rtY.Actuator_Ch0_Command_Model_out.COM[i] != 0) {
env->triggerCommand1 = true; env->triggerCommand1 = true;
memcpy(&env->triggerActuatorCmdBus_1, &Actuator_Ch0_Command_Model, sizeof(ActuatorCmdBus)); memcpy(&env->triggerActuatorCmdBus_1, &rtY.Actuator_Ch0_Command_Model_out, sizeof(ActuatorCmdBus));
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
#if (LOG_LIN1_ACTUATOR == 1) #if (LOG_LIN1_ACTUATOR == 1)
for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) { for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch0_Command_Model.COM[j]) { switch (rtY.Actuator_Ch0_Command_Model_out.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch0_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j])
break; break;
} }
@ -136,8 +136,8 @@ static bool setActuatorBusy(tModelTask *env) {
LoggerFormatError(LOGGER, LOG_SIGN, LoggerFormatError(LOGGER, LOG_SIGN,
"LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)",
j, j,
Actuator_Ch0_Command_Model.BUS_ADR[j], rtY.Actuator_Ch0_Command_Model_out.BUS_ADR[j],
Actuator_Ch0_Command_Model.COM[j]) rtY.Actuator_Ch0_Command_Model_out.COM[j])
} }
} }
} }
@ -155,34 +155,34 @@ static bool setActuatorBusy(tModelTask *env) {
if (env->triggerCommand2 == false) { if (env->triggerCommand2 == false) {
for (uint8_t i = 0; i < env->linTaskActuator2->LIN_ISSR_ALL; ++i) { for (uint8_t i = 0; i < env->linTaskActuator2->LIN_ISSR_ALL; ++i) {
if (Actuator_Ch1_Command_Model.COM[i] != 0) { if (rtY.Actuator_Ch1_Command_Mode_out.COM[i] != 0) {
env->triggerCommand2 = true; env->triggerCommand2 = true;
memcpy(&env->triggerActuatorCmdBus_2, &Actuator_Ch1_Command_Model, sizeof(ActuatorCmdBus)); memcpy(&env->triggerActuatorCmdBus_2, &rtY.Actuator_Ch1_Command_Mode_out, sizeof(ActuatorCmdBus));
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
#if (LOG_LIN2_ACTUATOR == 1) #if (LOG_LIN2_ACTUATOR == 1)
for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) { for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch1_Command_Model.COM[j]) { switch (rtY.Actuator_Ch1_Command_Mode_out.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch1_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j])
break; break;
} }
@ -195,8 +195,8 @@ static bool setActuatorBusy(tModelTask *env) {
LoggerFormatError(LOGGER, LOG_SIGN, LoggerFormatError(LOGGER, LOG_SIGN,
"LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)",
j, j,
Actuator_Ch1_Command_Model.BUS_ADR[j], rtY.Actuator_Ch1_Command_Mode_out.BUS_ADR[j],
Actuator_Ch1_Command_Model.COM[j]) rtY.Actuator_Ch1_Command_Mode_out.COM[j])
} }
} }
} }
@ -214,34 +214,34 @@ static bool setActuatorBusy(tModelTask *env) {
if (env->triggerCommand3 == false) { if (env->triggerCommand3 == false) {
for (uint8_t i = 0; i < env->linTaskActuator3->LIN_ISSR_ALL; ++i) { for (uint8_t i = 0; i < env->linTaskActuator3->LIN_ISSR_ALL; ++i) {
if (Actuator_Ch2_Command_Model.COM[i] != 0) { if (rtY.Actuator_Ch2_Command_Model_out.COM[i] != 0) {
env->triggerCommand3 = true; env->triggerCommand3 = true;
memcpy(&env->triggerActuatorCmdBus_3, &Actuator_Ch2_Command_Model, sizeof(ActuatorCmdBus)); memcpy(&env->triggerActuatorCmdBus_3, &rtY.Actuator_Ch2_Command_Model_out, sizeof(ActuatorCmdBus));
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
#if (LOG_LIN3_ACTUATOR == 1) #if (LOG_LIN3_ACTUATOR == 1)
for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) { for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch2_Command_Model.COM[j]) { switch (rtY.Actuator_Ch2_Command_Model_out.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j])
break; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatTrace(LOGGER, LOG_SIGN, LoggerFormatTrace(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j,
Actuator_Ch2_Command_Model.BUS_ADR[j]) rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j])
break; break;
} }
@ -254,8 +254,8 @@ static bool setActuatorBusy(tModelTask *env) {
LoggerFormatError(LOGGER, LOG_SIGN, LoggerFormatError(LOGGER, LOG_SIGN,
"LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)",
j, j,
Actuator_Ch2_Command_Model.BUS_ADR[j], rtY.Actuator_Ch2_Command_Model_out.BUS_ADR[j],
Actuator_Ch2_Command_Model.COM[j]) rtY.Actuator_Ch2_Command_Model_out.COM[j])
} }
} }
} }