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-04-28 10:10:51 +03:00
parent fca250bbbc
commit 1c0f8e6a97
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Model_Task.c
View File

@ -48,21 +48,21 @@ static bool setActuatorBusy(tModelTask *env) {
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 (Actuator_Ch0_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatInfo(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; break;
} }
default: { default: {
LoggerFormatInfo(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])
} }
} }
} }
@ -93,21 +93,21 @@ static bool setActuatorBusy(tModelTask *env) {
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 (Actuator_Ch1_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatInfo(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; break;
} }
default: { default: {
LoggerFormatInfo(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])
} }
} }
} }
@ -134,24 +134,24 @@ static bool setActuatorBusy(tModelTask *env) {
#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->linTaskActuator1->LIN_ISSR_ALL; ++j) { for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) {
switch (Actuator_Ch2_Command_Model.COM[j]) { switch (Actuator_Ch2_Command_Model.COM[j]) {
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatInfo(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; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatInfo(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; break;
} }
default: { default: {
LoggerFormatInfo(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])
} }
} }
} }
@ -176,8 +176,9 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
rtDW.t_now = SystemGetMs(); rtDW.t_now = SystemGetMs();
HVAC_model_step(); HVAC_model_step();
env->isUpdate = true;
setActuatorBusy(env); setActuatorBusy(env);
osMutexRelease(env->access); osMutexRelease(env->access);
} }
SystemDelayMs(100); SystemDelayMs(100);

3
Model_Task.h
View File

@ -27,9 +27,6 @@ typedef struct {
ActuatorCmdBus triggerActuatorCmdBus_1; ActuatorCmdBus triggerActuatorCmdBus_1;
ActuatorCmdBus triggerActuatorCmdBus_2; ActuatorCmdBus triggerActuatorCmdBus_2;
ActuatorCmdBus triggerActuatorCmdBus_3; ActuatorCmdBus triggerActuatorCmdBus_3;
//uint8_t numCommand[9];
bool isUpdate;
struct { struct {
osThreadId_t id; osThreadId_t id;